3 commits

Author	SHA1	Message	Date
Marc Zinnschlag	47dd9505a9	copy meta data from game file when merging	2015-08-16 18:27:17 +02:00
Marc Zinnschlag	1b663f01af	create merged document and open a view for it (document is still empty at this point)	2015-08-16 15:24:48 +02:00
Marc Zinnschlag	904ad94952	added merge operation (doesn't do anything yet)	2015-08-13 12:03:20 +02:00