]> 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 | compact (merge: b4613e5 9365b7a)
Merge branch 'Mario/weapons_new'
authorMario <zacjardine@y7mail.com>
Thu, 11 Dec 2014 23:22:03 +0000 (10:22 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 11 Dec 2014 23:22:03 +0000 (10:22 +1100)

Trivial merge