]> de.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: 6e5643c 841eddf)
Merge branch 'master' into nyov/instagib-rename
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 03:24:29 +0000 (14:24 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 03:24:29 +0000 (14:24 +1100)

Trivial merge