]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commit8dd141bd1f48dd4c5f72651ab198f32727460f9a
tree1061168f3ea2d7b033d76bfa21f766fdae238e77
parenta6ccfcdbd7a297f13bf36c7771b9e4796c78ca75
parentbfac159db2e9eb481dfc9e873d994182d08fd64a
Merge branch 'tzork/map-topoftheworld' of git://nl.git.xonotic.org/xonotic/xonotic-maps.pk3dir into tzork/map-topoftheworld

Conflicts:
scripts/map_topoftheworld.shader