From: Maik Merten <maikmerten@googlemail.com>
Date: Tue, 28 Dec 2010 16:31:51 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/techa... 
X-Git-Tag: xonotic-v0.5.0~111^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=51721f4c0ee108dbbfa8c069f7fcaca26ee357ba;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/techassault

Conflicts:
	scripts/shaderlist.txt
---

51721f4c0ee108dbbfa8c069f7fcaca26ee357ba
diff --cc scripts/shaderlist.txt
index 1c73fa2d,73593a2d..1422b067
--- a/scripts/shaderlist.txt
+++ b/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