cc9cii 6ca88dc541 Merge branch 'master' into mouse-picking ... Conflicts: apps/opencs/model/settings/usersettings.cpp		2014-10-29 09:28:23 +11:00
..
doc	Merge branch 'double'	2014-10-27 09:56:52 +01:00
filter	Tweak the look of the recordfilterbox. Keep titlebar if floating.	2014-09-23 20:51:14 +10:00
render	Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.	2014-10-29 00:50:48 +11:00
settings	Merge branch 'settings'	2014-10-19 13:44:15 +02: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 'master' into mouse-picking	2014-10-29 09:28:23 +11:00