]> Devoid-pointer.net GitWeb - anyanka.git/commit
Merge branch 'master' of devoid-pointer.net:anyanka
authorMichal Malý <madcatxster@devoid-pointer.net>
Thu, 31 Jul 2014 08:38:43 +0000 (10:38 +0200)
committerMichal Malý <madcatxster@devoid-pointer.net>
Thu, 31 Jul 2014 08:38:43 +0000 (10:38 +0200)
commitea7e26f8323bb998d847b671f733138f6ec2cb26
tree2b9994112f0fce398e9aae48ac6198f7882de45c
parentc437ff4dbd52e0affccac26c1c9bbd2707d8b0b4
parent4c21316481208fda42850d889396470de9707deb
Merge branch 'master' of devoid-pointer.net:anyanka

Conflicts:
datamanager.cpp
signal.h
datafilesloader.cpp
datamanager.cpp
datamanager.h
signal.cpp
signal.h