Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into tzork/terrain01x
authorJakob MG <jakob_mg@hotmail.com>
Thu, 5 Aug 2010 11:07:55 +0000 (13:07 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 5 Aug 2010 11:07:55 +0000 (13:07 +0200)
commit3c07809535a4743e313a3b3ca727a5e469fd393f
treebf4bbfab2350f65543d0331c6261d22990d39709
parentdd632b85e8b97fb9a7da562e56ee41347ff8ac3d
parentd921f21a0d29d43961fc1774163435363275cd36
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into tzork/terrain01x