cc9cii 740c8bc6f1 Merge branch 'master' into cc9cii ... Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/view/world/dialoguesubview.cpp		2015-07-27 10:53:39 +10:00
..
doc	Merge branch 'meta'	2015-06-26 18:37:39 +02:00
filter	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
settings	Merge branch 'master' into cc9cii	2015-07-27 10:53:39 +10:00
tools	Merge remote-tracking branch 'cc9cii/master'	2015-06-25 14:06:22 +02:00
world	Merge branch 'master' into autocalc	2015-06-27 07:46:36 +10:00