]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/lightspeed
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 13 Jul 2013 09:17:46 +0000 (11:17 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 13 Jul 2013 09:17:46 +0000 (11:17 +0200)
commit8866edaa52a16100ceab93263ed3936b5f5f0734
tree57033ce1a5b51b820546880c76621105d2cd81cc
parent1b8dd773a1224a2b3552356f47d1236b3b119fdf
parenteda70ff01ada5a6f2510b2e0720ece7ccbab1adf
Merge branch 'master' into matthiaskrgr/lightspeed

Conflicts:
maps/lightspeed.map.options
maps/lightspeed.map.options