Sven Eberhardt 94669cebe4 Merge branch 'master' of ssh://git.openclonk.org/openclonk ... Conflicts: src/editor/C4ConsoleQtPropListViewer.cpp		2017-05-07 15:16:01 -04:00
..
Clonk.ocd/AltSkins.ocd	Move Amazon and Ogre alt skins from FightForGidl to Decoration.ocd	2017-02-26 12:18:15 -05:00
Misc.ocd	Add alternative weapon skins as attack modes	2017-02-26 14:59:34 -05:00
Relics.ocd	Convert all text files in planet to UTF-8	2016-12-11 21:19:13 +01:00
Room.ocd	Switch: properly process and save editor actions	2017-05-06 18:55:27 +02:00
System.ocg	add scorches to Decoration.ocd	2015-10-11 12:11:49 +02:00
Vegetation.ocd	Let plants grow less crowded, especially different kinds of plants (#1607).	2017-01-04 03:33:28 +01:00
Village.ocd	Merge branch 'master' of ssh://git.openclonk.org/openclonk	2017-05-07 15:16:01 -04:00
Info.txt	Decoration.ocd added and includes ruins from DarkCastle	2014-04-06 15:50:06 +02:00