]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 615bb68 f05fed1)
Merge branch 'Mario/buffs'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:07:45 +0000 (22:07 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:07:45 +0000 (22:07 +1100)

Trivial merge