]> 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: a6ccfcd bfac159)
Merge branch 'tzork/map-topoftheworld' of git://nl.git.xonotic.org/xonotic/xonotic...
authorJakob MG <jakob_mg@hotmail.com>
Sat, 30 Jun 2012 03:11:11 +0000 (05:11 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 30 Jun 2012 03:11:11 +0000 (05:11 +0200)
Conflicts:
scripts/map_topoftheworld.shader


Trivial merge