Petr Mrázek acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools ...

Conflicts:
	logic/net/URLConstants.h

Resolve issues with multiple definitions of URL constants by moving them to their own object file.

2014-02-25 01:52:58 +01:00

..

dialogs

Merge branch 'feature_screenshots' into integration_json_and_tools

2014-02-25 01:52:58 +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

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

…

Platform_X11.cpp

…

Platform.h

…