Julius Michaelis
|
35c3d4a421
|
Merge branch 'master' into floating-point
(Just merged. Nothing was tested.)
Conflicts:
config.h.cmake
docs/de.po
planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Elevator.ocd/Case.ocd/Script.c
planet/Objects.ocd/Vegetation.ocd/Grass.ocd/Script.c
planet/Tests.ocf/AirRace.ocs/Extra.ocd/Rocket.ocd/Script.c
planet/Tests.ocf/AirRace.ocs/Extra.ocd/WeaponSpawn.ocd/Script.c
planet/Tests.ocf/AirRace.ocs/Script.c
planet/Tests.ocf/Experimental.ocd/LiftTower.ocd/Hook.ocd/Script.c
planet/Tests.ocf/Experimental.ocd/LiftTower.ocd/Rope.ocd/Script.c
planet/Tests.ocf/Moss_Test.ocs/Script.c
src/script/C4AulParse.cpp
|
2012-12-28 17:52:14 +01:00 |