Marek Kochanowicz 269a357644 Merge remote-tracking branch 'master/refs' into dialog-fix ... Conflicts: CMakeLists.txt apps/opencs/CMakeLists.txt apps/opencs/view/world/dialoguesubview.cpp		2014-06-09 11:51:41 +02:00
..
doc	Merge branch 'refs'	2014-05-30 10:38:38 +02:00
filter	Various fixes for CppCheck warnings.	2013-12-06 07:36:16 +01:00
settings	removed a redundant (and unsufficiently configured) copy of ConfigurationManager	2014-05-10 17:46:10 +02:00
tools	silenced two warnings	2014-05-30 10:18:05 +02:00
world	Merge remote-tracking branch 'master/refs' into dialog-fix	2014-06-09 11:51:41 +02:00