cc9cii 809b8c6d5b Conflicts: ...

apps/opencs/view/render/pagedworldspacewidget.cpp

2014-10-12 05:54:21 +11:00

..

model

Conflicts:

2014-10-12 05:54:21 +11:00

view

Conflicts:

2014-10-12 05:54:21 +11:00

CMakeLists.txt

Conflicts:

2014-10-12 05:54:21 +11:00

editor.cpp

Conflicts:

2014-10-12 05:54:21 +11:00

editor.hpp

Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.

2014-09-21 20:55:52 +10:00

main.cpp

Merge branch 'operations' into load

2014-05-08 13:17:24 +02:00