]> 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: f1be729 e607064)
Merge branch 'Mario/nade_updates'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 16:48:46 +0000 (03:48 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 16:48:46 +0000 (03:48 +1100)

Trivial merge