Marc Zinnschlag a60e4c036f Merge branch 'mode' ... Conflicts: apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/worldspacewidget.cpp apps/opencs/view/render/worldspacewidget.hpp		2014-11-13 11:12:20 +01:00
..
doc
filter
render	Merge branch 'mode'	2014-11-13 11:12:20 +01:00
settings
tools
widget
world	Merge branch 'mode'	2014-11-13 11:12:20 +01:00