krzys-h 96d49d84aa Merge branch 'dev' into dev-physfs ... Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp		2014-07-11 15:24:44 +02:00
..
mocks	Some further refactoring and test corrections	2013-12-20 20:18:30 +01:00
stubs	Fix test compilation	2014-06-24 17:38:28 +02:00
CMakeLists.txt	Fix test compilation	2014-06-24 17:38:28 +02:00
edit_test.cpp	Fixed tests	2014-06-26 22:14:30 +02:00