Marc Zinnschlag 0b309d9ef4 Merge branch 'master' into load ... Conflicts: apps/opencs/view/doc/viewmanager.cpp		2014-05-03 14:36:06 +02:00
..
doc	Merge branch 'master' into load	2014-05-03 14:36:06 +02:00
filter	removed signals	2014-04-15 20:39:19 +02:00
render	allow multiple cell coordinates in c-type hint for scene subviews	2014-04-07 15:23:14 +02:00
settings	removed qdebug references	2014-04-26 21:43:59 -05:00
tools	Re-link user settings to editor main application	2014-04-22 22:19:53 -05:00
world	OpenCS changes to allow compilation with MSVC 11.0.	2014-04-29 22:46:55 +10:00