Marc Zinnschlag 55dfe48ef7 copy meta data from game file when merging ...

(cherry picked from commit 47dd9505a9464dc5c947f409c3c4a80cf4d8e395)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp

2015-11-01 13:34:41 +11:00

..

doc

copy meta data from game file when merging

2015-11-01 13:34:41 +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

copy meta data from game file when merging

2015-11-01 13:34:41 +11:00

world

copy meta data from game file when merging

2015-11-01 13:34:41 +11:00