Marc Zinnschlag 40753aa9a3 simplifying merge stage		2015-08-25 08:43:03 +02:00
..
doc	flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)	2015-08-23 12:37:45 +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	simplifying merge stage	2015-08-25 08:43:03 +02:00
world	copy meta data from game file when merging	2015-08-16 18:27:17 +02:00