Marc Zinnschlag 0b309d9ef4 Merge branch 'master' into load ... Conflicts: apps/opencs/view/doc/viewmanager.cpp		2014-05-03 14:36:06 +02:00
..
doc	content file loading progress bar	2014-05-03 13:01:29 +02:00
filter	Various fixes for CppCheck warnings.	2013-12-06 07:36:16 +01:00
settings	OpenCS changes to allow compilation with MSVC 11.0.	2014-04-29 22:46:55 +10:00
tools	fixed encoding problems	2014-03-21 11:56:48 +01:00
world	removed an unused function	2014-04-20 17:28:10 +02:00