cc9cii 809b8c6d5b Conflicts: ... apps/opencs/view/render/pagedworldspacewidget.cpp		2014-10-12 05:54:21 +11:00
..
doc	Conflicts:	2014-10-12 05:54:21 +11:00
filter	Tweak the look of the recordfilterbox. Keep titlebar if floating.	2014-09-23 20:51:14 +10:00
render	Conflicts:	2014-10-12 05:54:21 +11:00
settings	Conflicts:	2014-10-12 05:54:21 +11: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	Conflicts:	2014-10-12 05:54:21 +11:00