]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d590b31 1d8eda7)
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)

Trivial merge