]> 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: e2f2bfb 8139f0c)
Merge remote-tracking branch 'origin/master' into mirceakitsune/playermodel_terminus
authorMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 15:34:35 +0000 (02:34 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 15:34:35 +0000 (02:34 +1100)

Trivial merge