David Dormagen f89b8c8319 Merge branch 'master' into Controls ... Conflicts: planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c planet/System.ocg/ClonkControl.c src/gui/C4MouseControl.cpp src/landscape/C4PXS.cpp		2014-12-25 15:24:19 +01:00
..
DefCore.txt	increase game content version entries to 6.0	2014-12-12 22:58:16 +01:00
Graphics.png	Change .c4d extension to .ocd	2011-03-13 16:55:00 +01:00
Script.c	interaction menu: further fixes and cleanups; external menus can now be integrated smoothly into the framework; the production menu is now shown in the interaction menu	2014-03-26 23:55:32 +01:00