]> 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: 112e186 9697490)
Merge branch 'Mario/warpzone_self'
authorMario <mario@smbclan.net>
Sun, 27 Mar 2016 05:14:45 +0000 (15:14 +1000)
committerMario <mario@smbclan.net>
Sun, 27 Mar 2016 05:14:45 +0000 (15:14 +1000)

Trivial merge