]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into diabolik/techpanel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 21 Aug 2010 01:26:32 +0000 (21:26 -0400)
1  2 
scripts/shaderlist.txt

Simple merge