Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 21:57:20 +0000 (22:57 +0100)
committerMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 21:57:20 +0000 (22:57 +0100)
commite9f0618204a8a73a16fb938ffacc6ae835a8b543
treedaa60e0a6986255a44c6fb4a6200afd7ad8b00aa
parentb2b82431ea8a69387b101e7d1c77b9d3fa626f8d
parente71a0387cacd2f1015d23b228f0ac3b7aa7adef9
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir