MultiMC5/gui
Petr Mrázek 49dc9695f5 Merge branch 'fix_json_version' into integration_json_and_tools
Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.
2014-02-24 02:35:01 +01:00
..
dialogs Merge branch 'feature_profiling' into integration_json_and_tools 2014-02-24 00:29:13 +01:00
groupview Fix groupview issues 2014-02-10 00:51:52 +01:00
widgets Pave. 2014-02-04 01:40:51 +01:00
ConsoleWindow.cpp Small tweaks to make things better. 2014-02-06 09:32:44 +01:00
ConsoleWindow.h Small tweaks to make things better. 2014-02-06 09:32:44 +01:00
ConsoleWindow.ui Use monospace font in the console. 2013-12-16 02:19:07 +01:00
MainWindow.cpp Merge branch 'fix_json_version' into integration_json_and_tools 2014-02-24 02:35:01 +01:00
MainWindow.h Fix for windows and update tool menu after closing settings dialog 2014-02-16 11:49:55 +01:00
MainWindow.ui Underp. Don't depend on OneSix. Nicer "menu" style choosing. 2014-02-15 22:26:44 +01: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