Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent...
authorMaik Merten <maikmerten@googlemail.com>
Sat, 19 Mar 2011 11:58:10 +0000 (12:58 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Sat, 19 Mar 2011 11:58:10 +0000 (12:58 +0100)
1  2 
scripts/shaderlist.txt

Simple merge