]> 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: 56149e2 615bb68)
Merge remote-tracking branch 'origin/master' into Mario/buffs
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:06:07 +0000 (22:06 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:06:07 +0000 (22:06 +1100)

Trivial merge