]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 45d43d6 0feda24)
Merge remote branch 'refs/remotes/origin/diabolik/techpanel'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:41:18 +0000 (05:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:41:18 +0000 (05:41 +0200)
1  2 
scripts/shaderlist.txt patch | diff1 | diff2 | blob | history

diff --combined scripts/shaderlist.txt
index 324eb938363d7760e63954cd919500edbbba88b8,d735750083a0276fce430690b21185d704ebf022..b067ec2a8a9cf1541fb6cc528c4068d795252491
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -5,7 -5,7 +5,8 @@@ extragalacti
  exx
  ex2x
  facility114x
 +facility114invx
  trak4x
  trak5x
  terrain01x
+ techpanelx