54a9ee5eb0
Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui |
||
---|---|---|
.. | ||
dialogs | ||
widgets | ||
ConsoleWindow.cpp | ||
ConsoleWindow.h | ||
ConsoleWindow.ui | ||
MainWindow.cpp | ||
MainWindow.h | ||
MainWindow.ui | ||
Platform_Other.cpp | ||
Platform_X11.cpp | ||
Platform.h |