Marc Zinnschlag 4a02563708 Merge branch 'master' into buttons ... Conflicts: apps/opencs/view/render/instancemode.cpp		2016-01-19 13:59:24 +01:00
..
doc	Remove unused forward declarations in filedialog.hpp	2016-01-17 14:18:49 -05:00
filter
prefs
render	Merge branch 'master' into buttons	2016-01-19 13:59:24 +01:00
tools
widget	Merge branch 'master' into buttons	2016-01-19 13:59:24 +01:00
world	added instance mode sub-modes	2016-01-15 12:07:25 +01:00