]> 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: f164803 94a66c4)
Merge branch 'master' into debugger/shadow/atelier
authorMario <zacjardine@y7mail.com>
Sat, 11 Jul 2015 13:27:59 +0000 (23:27 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 11 Jul 2015 13:27:59 +0000 (23:27 +1000)

Trivial merge