Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor ... Conflicts: planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt		2016-08-13 23:42:59 -04:00
..
DefCore.txt	Unify rule picture size display in the editor to 32x32	2016-08-06 10:32:21 -04:00
Graphics.2.png	Make standard goals and rules visible as icons in editor	2016-08-04 19:32:57 -04:00
Script.c	Merge branch 'master' into qteditor	2016-08-13 23:42:59 -04:00
StringTblDE.txt	renamed "Gaya" to "Gaia"	2016-08-07 17:26:36 +02:00
StringTblUS.txt	renamed "Gaya" to "Gaia"	2016-08-07 17:26:36 +02:00