]> 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: c283318 236c354)
Merge branch 'Mario/map_nukes'
authorMario <zacjardine@y7mail.com>
Sat, 11 Jul 2015 13:23:01 +0000 (23:23 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 11 Jul 2015 13:23:01 +0000 (23:23 +1000)

Trivial merge