Marc Zinnschlag 81188a3456 silenced a warning ... (cherry picked from commit 9cf793c0b5) Conflicts: apps/opencs/model/doc/document.cpp		2015-11-01 13:39:18 +11:00
..
doc	silenced a warning	2015-11-01 13:39:18 +11:00
filter	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
settings	Rewording of the user setting for extended configuration	2015-07-30 09:32:58 +10:00
tools	simplifying merge stage	2015-11-01 13:37:41 +11:00
world	copy meta data from game file when merging	2015-11-01 13:34:41 +11:00