]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'TimePath/gamemode_composition' of https://gitlab.com/xonotic/xonotic...
authorMario <mario@smbclan.net>
Wed, 14 Oct 2015 11:18:59 +0000 (21:18 +1000)
committerMario <mario@smbclan.net>
Wed, 14 Oct 2015 11:18:59 +0000 (21:18 +1000)
commit74c8797d64197059556339cd98e3a78731a5049f
treed2269e3fa3f02216e743b40343b4c5e757cfb374
parentd590b31e05a556e74208f9b0d07c3161ce1c3c84
parent1d8eda74bd20ea5eaafe078313a0e4f7ca40134e
Merge branch 'TimePath/gamemode_composition' of https://gitlab.com/xonotic/xonotic-data.pk3dir into TimePath/gamemode_composition