49dc9695f5
Conflicts: logic/OneSixInstance.cpp logic/OneSixVersionBuilder.cpp Some fixage. Yay for conflicts. |
||
---|---|---|
.. | ||
dialogs | ||
groupview | ||
widgets | ||
ConsoleWindow.cpp | ||
ConsoleWindow.h | ||
ConsoleWindow.ui | ||
MainWindow.cpp | ||
MainWindow.h | ||
MainWindow.ui | ||
Platform_Other.cpp | ||
Platform_X11.cpp | ||
Platform.h |