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
..
cbot	Fixes for compiling on MSYS	2013-03-22 19:17:08 +01:00
envs	Fix test compilation	2014-06-26 22:36:57 +02:00
unit	Merge branch 'dev' into dev-physfs	2014-07-11 15:24:44 +02:00
CMakeLists.txt	Fix problem with gtest and pthread on some systems	2013-12-20 20:19:21 +01:00