]> 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: d2cd0d5 841eddf)
Merge remote-tracking branch 'origin/master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:44:00 +0000 (13:44 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:44:00 +0000 (13:44 +1100)

Trivial merge