Marc Zinnschlag 6eff5ecaad Merge branch 'operations' into load ... Conflicts: apps/opencs/main.cpp apps/opencs/model/doc/document.cpp		2014-05-08 13:17:24 +02:00
..
doc	Merge branch 'operations' into load	2014-05-08 13:17:24 +02:00
filter	removed signals	2014-04-15 20:39:19 +02:00
render	fixed compilation	2014-05-04 15:13:03 +02:00
settings	Decoupled setting definitions from the Setting class. QSettings	2014-05-07 21:59:26 -05:00
tools	Re-link user settings to editor main application	2014-04-22 22:19:53 -05:00
world	Merge remote-tracking branch 'graffy76/master'	2014-05-07 10:35:11 +02:00