]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'Mirio/toxic' into matthiaskrgr/toxic
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 28 Aug 2013 12:04:54 +0000 (14:04 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 28 Aug 2013 12:04:54 +0000 (14:04 +0200)
commit904b4012a8ccacfccc0983b191dd7393b4e1d6f0
tree551f187770719c7c491f06255a26da93293ef02c
parentac274a1f0039d1b79bc5af73be1bc57f87c9cd84
parenta08363fdfbd424a348bb2e6b292765a4754c48a0
Merge branch 'Mirio/toxic' into matthiaskrgr/toxic

Conflicts:
maps/toxic.map.options
maps/drain.map.options
maps/toxic.map.options