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

…

widgets

…

ConsoleWindow.cpp

…

ConsoleWindow.h

…

ConsoleWindow.ui

…

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

…

Platform_X11.cpp

…

Platform.h

…