Jan Dalheimer fcc5bc2ce0 Merge branch 'develop' into feature_badges ... Conflicts: logic/OneSixInstance.cpp		2014-03-10 19:24:29 +01:00
..
dialogs	Improve reporting of version file errors.x	2014-03-09 23:42:25 +01:00
groupview	Instance badges. Some easter eggs and one for broken so far.	2014-03-10 17:38:27 +01:00
widgets	Pave.	2014-02-04 01:40:51 +01:00
ConsoleWindow.cpp	Screenshot fixes, move some code around, fix some stuff	2014-02-24 09:34:21 +01:00
ConsoleWindow.h	Screenshot fixes, move some code around, fix some stuff	2014-02-24 09:34:21 +01:00
ConsoleWindow.ui	Deleting screenshots. Needs fixing.	2014-02-24 17:40:05 -05:00
MainWindow.cpp	Merge branch 'feature_screenshots' into integration_json_and_tools	2014-02-25 01:52:58 +01:00
MainWindow.h	Merge branch 'feature_screenshots' into integration_json_and_tools	2014-02-25 01:52:58 +01:00
MainWindow.ui	Deleting screenshots. Needs fixing.	2014-02-24 17:40:05 -05:00
Platform_Other.cpp	Reformat and (slightly) decruft all the things.	2013-11-04 02:53:05 +01:00
Platform_X11.cpp	Reformat and (slightly) decruft all the things.	2013-11-04 02:53:05 +01:00
Platform.h	Reformat and (slightly) decruft all the things.	2013-11-04 02:53:05 +01:00