Merge remote branch 'origin/savagex/techassault'
authortzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)
committertzork <jakob_mg@hotmail.com>
Sat, 5 Feb 2011 13:51:20 +0000 (14:51 +0100)
1  2 
scripts/shaderlist.txt

@@@ -35,5 -35,3 +36,5 @@@ techpanel
  terrain01x
  trak4x
  trak5x
- trak7x
 +trak6x
++trak7x