Marc Zinnschlag b7983d08ba fixed merge stage order; added proper initialisation		2015-08-30 11:08:56 +02:00
..
doc	silenced a warning	2015-08-25 11:39:43 +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	fixed merge stage order; added proper initialisation	2015-08-30 11:08:56 +02:00
world	fixed record state issues after merge	2015-08-25 12:40:40 +02:00