Daniel Molkentin bb32831a60 Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir ... Conflicts: src/gui/folderman.cpp		2014-07-17 11:31:45 +02:00
..
3rdparty	Add Q_DECL_OVERRIDE for all function that are overriding something	2014-07-09 23:31:56 +02:00
cmd	Try to handle BUILD_LIBRARIES_ONLY correctly	2014-07-11 12:36:01 +02:00
gui	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir	2014-07-17 11:31:45 +02:00
libsync	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir	2014-07-17 11:31:45 +02:00
CMakeLists.txt	Make krazy target work again	2014-07-14 12:19:32 +02:00