marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,834 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

3 Commits (5f3c32c81f43c8a273e58179a85d911625b31d38)

Author SHA1 Message Date
Clonkonaut fdf6130cbe Fixed my really bad merge... 2014-05-09 21:28:33 +02:00
Clonkonaut d291623f24 Merge remote-tracking branch 'remotes/origin/master' into heavy-resources 
Conflicts:
	planet/Arena.ocf/Hideout.ocs/Material.ocg/Amethyst.ocm
	planet/Arena.ocf/Hideout.ocs/Material.ocg/Ruby.ocm
	planet/Missions.ocf/AcidDrilling.ocs/Scenario.txt
	planet/Missions.ocf/DeadlyGrotto.ocs/Scenario.txt
	planet/Missions.ocf/GoldenMountain.ocs/Scenario.txt
	planet/Missions.ocf/MineRescue.ocs/Scenario.txt
	planet/Missions.ocf/Skylands.ocs/Scenario.txt
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Worlds.ocf/AcidGoldMine.ocs/Scenario.txt
	planet/Worlds.ocf/GoldRush.ocs/Scenario.txt
	planet/Worlds.ocf/IronPeak.ocs/Scenario.txt
	planet/Worlds.ocf/Krakatoa.ocs/Scenario.txt
	planet/Worlds.ocf/RubyCave.ocs/Scenario.txt
 2014-05-09 19:45:52 +02:00
Maikel de Vries 1c6f62466b Fixed Ametyst to Amethyst typos 2014-04-02 19:46:52 +02:00