]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/LMS_improvements 394/head
authorterencehill <piuntn@gmail.com>
Sun, 27 Nov 2016 23:23:32 +0000 (00:23 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 27 Nov 2016 23:23:32 +0000 (00:23 +0100)
commit2046c0aa48fa58594d075ca4247a7dd724ae9bfb
treed484e86f1326b53cf292b4fd3bf35e8c3c7a20e2
parent79c96ff86940f6bc62cd588597182c8066445e44
parent8802dc71a56bfe87db766c6dab331046575f7eb9
Merge branch 'master' into terencehill/LMS_improvements