Merge remote branch 'origin/savagex/techassault'

author tzork <jakob_mg@hotmail.com>

Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)

committer tzork <jakob_mg@hotmail.com>

Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)
author tzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)
committer tzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)
diff --cc scripts/shaderlist.txt

index 50610672faf138c1b52e3f3bfa8628764f093996,1422b067fac4115db3d1b6ef0e460d61c8a61305..f89ac5dd13f57ae892d18bd98906300ec87d72cc
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -35,5 -35,3 +36,5 @@@ techpanel
   terrain01x
   trak4x
   trak5x
- trak7x
+ +trak6x
++trak7x
author	tzork <jakob_mg@hotmail.com>
	Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)
committer	tzork <jakob_mg@hotmail.com>
	Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)