]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04d4274 0743a49)
Merge branch 'master' into tzork/map-dotc_test4
authorMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 02:40:04 +0000 (13:40 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 02:40:04 +0000 (13:40 +1100)

Trivial merge