Marc Zinnschlag 3902513e65 merge id collections		2015-08-21 14:02:32 +02:00
..
doc	copy meta data from game file when merging	2015-08-16 18:27:17 +02:00
filter	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
settings	Update to upstream/master. Resolve merge conflicts	2015-07-27 13:54:13 +03:00
tools	merge id collections	2015-08-21 14:02:32 +02:00
world	copy meta data from game file when merging	2015-08-16 18:27:17 +02:00