cc9cii 9716b671f1 Merge branch 'cc9cii' into Feature-1278 ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/nestedcoladapterimp.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/worldspacewidget.cpp

2015-11-07 12:04:09 +11:00

..

doc

Fix issue where mandatory effects field was allowed to be empty (and vice versa)

2015-11-01 23:09:06 +11:00

filter

Fixed filter reapplication on Description column change and on State

2015-11-01 22:50:37 +11:00

render

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00

settings

Add support to build with Qt5 (Task #2665)

2015-06-12 15:13:42 +02:00

tools

create merged document and open a view for it (document is still empty at this point)

2015-11-01 13:31:28 +11:00

widget

Fix tab indentations in apps/ and components/

2015-11-01 21:34:23 +11:00

world

Merge branch 'cc9cii' into Feature-1278

2015-11-07 12:04:09 +11:00