Marc Zinnschlag 973c65bc82 merge id collections ...

(cherry picked from commit 3902513e65206908c0f0f54db213a7c9ea7f2fd0)

2015-11-01 13:35:15 +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

merge id collections

2015-11-01 13:35:15 +11:00

world

copy meta data from game file when merging

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