From: tzork <jakob_mg@hotmail.com>
Date: Sat, 5 Feb 2011 13:51:20 +0000 (+0100)
Subject: Merge remote branch 'origin/savagex/techassault'
X-Git-Tag: xonotic-v0.5.0~111
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13ae147f95bc8ae792026cce10dae775a397440b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/savagex/techassault'
---

13ae147f95bc8ae792026cce10dae775a397440b
diff --cc scripts/shaderlist.txt
index 50610672,1422b067..f89ac5dd
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -35,5 -35,3 +36,5 @@@ techpanel
  terrain01x
  trak4x
  trak5x
 +trak6x
- trak7x
++trak7x