13 commits

Author	SHA1	Message	Date
Kyle Cooley	98c38ad7d1	Merge cleanup.	2017-10-14 13:18:31 -04:00
Kyle Cooley	6d9d98c02c	Merge Land/LandTextures	2017-10-14 11:32:42 -04:00
Ewan Higgs	38a2de3c51	convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis	2017-06-09 16:49:25 +02:00
Marc Zinnschlag	a8dc1c1198	merge land tables	2015-09-03 16:15:00 +02:00
Marc Zinnschlag	890bbb6b11	merge land texture tables	2015-08-30 14:27:22 +02:00
Marc Zinnschlag	b7983d08ba	fixed merge stage order; added proper initialisation	2015-08-30 11:08:56 +02:00
Marc Zinnschlag	a97a632aa7	merge references tables	2015-08-26 17:21:24 +02:00
Marc Zinnschlag	f95950e8d8	merge referenceables table	2015-08-25 11:54:16 +02:00
Marc Zinnschlag	103073150e	added info tables and pathgrid table to merge operation	2015-08-23 12:58:49 +02:00
Marc Zinnschlag	3902513e65	merge id collections	2015-08-21 14:02:32 +02:00
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