Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/techa...
authorMaik Merten <maikmerten@googlemail.com>
Tue, 28 Dec 2010 16:31:51 +0000 (17:31 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Tue, 28 Dec 2010 16:31:51 +0000 (17:31 +0100)
Conflicts:
scripts/shaderlist.txt

1  2 
scripts/shaderlist.txt

@@@ -16,7 -16,7 +16,8 @@@ liquids_wate
  map_glowplant
  map_red-planet
  map_space-elevator
 +map_techassault
+ map_stormkeep
  model_bigfan01
  model_desertfactory
  model_tree