]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 31ba791 c35a168)
Merge branch 'master' into Mario/catharsis
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:28:30 +0000 (13:28 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:28:30 +0000 (13:28 +1100)

Trivial merge