Marc Zinnschlag e33314ad81 made merge operation more fluent ... (cherry picked from commit 16dda281ce)		2015-11-01 13:37:26 +11:00
..
doc	flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)	2015-11-01 13:37:01 +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	made merge operation more fluent	2015-11-01 13:37:26 +11:00
world	copy meta data from game file when merging	2015-11-01 13:34:41 +11:00