]> 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 | combined (merge: f9eba9e 2397776)
Merge remote-tracking branch 'origin/master' into matthiaskrgr/hudsetup
authorMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 10:08:51 +0000 (21:08 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 10:08:51 +0000 (21:08 +1100)

Trivial merge