Marc Zinnschlag 21b16f8425 Merge branch 'tables' ...

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp

2014-10-10 16:11:54 +02:00

..

doc

Merge branch 'tables'

2014-10-10 16:11:54 +02:00

filter

Tweak the look of the recordfilterbox. Keep titlebar if floating.

2014-09-23 20:51:14 +10:00

render

Merge remote-tracking branch 'scrawl/terrain'

2014-10-09 12:56:42 +02:00

settings

Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.

2014-10-02 07:00:15 +10:00

tools

make delegates use the whole document instead of the undo stack

2014-08-23 12:25:12 +02:00

widget

rewrote run tool profile management

2014-09-13 18:53:35 +02:00

world

Merge branch 'tables'

2014-10-10 16:11:54 +02:00