forked from Mirrors/openclonk
f89b8c8319
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 |
||
---|---|---|
.. | ||
StringTblDE.txt | ||
StringTblUS.txt |