Merge remote branch 'origin/master' into diabolik/techpanel

author Sahil Singhal <sahil@sahil-desktop.(none)>

Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)

committer Sahil Singhal <sahil@sahil-desktop.(none)>

Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)
author Sahil Singhal <sahil@sahil-desktop.(none)>
Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)
committer Sahil Singhal <sahil@sahil-desktop.(none)>
Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)
diff --combined scripts/shaderlist.txt

index e767d0449e5ac65282b3369414fd0b47c8124bcc,31cc7ec1d97788462ea5c6eae3280935129c2319..d735750083a0276fce430690b21185d704ebf022
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -3,8 -3,8 +3,9 @@@ decal
   exosystem
   extragalactic
   exx
+ ex2x
   facility114x
   trak4x
   trak5x
   terrain01x
+ +techpanelx
author	Sahil Singhal <sahil@sahil-desktop.(none)>
	Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)
committer	Sahil Singhal <sahil@sahil-desktop.(none)>
	Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)