]> 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: 8e07ba6 98bf0d2)
Merge remote-tracking branch 'origin/morphed/pillar' into tzork/map-topoftheworld
authorJakob MG <jakob_mg@hotmail.com>
Tue, 3 Jul 2012 10:19:05 +0000 (12:19 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 3 Jul 2012 10:19:05 +0000 (12:19 +0200)

Trivial merge