Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorMirio <opivy@hotmail.de>
Mon, 27 Mar 2017 16:12:39 +0000 (18:12 +0200)
committerMirio <opivy@hotmail.de>
Mon, 27 Mar 2017 16:12:39 +0000 (18:12 +0200)
commitbd9b9da3b68cd131537d61a2cf875a769b25a8c5
tree3d3df24d020026d7b1663aef729a4baab703a721
parent9d863cc4be199eb86568e9d7c6749c252af4b50d
parent6f42646943e34931d3adb6cc2b03c6a169aba87a
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir