]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into savagex/unsea...
authorMaik Merten <maikmerten@googlemail.com>
Sun, 27 Nov 2011 10:16:37 +0000 (11:16 +0100)
committerMaik Merten <maikmerten@googlemail.com>
Sun, 27 Nov 2011 10:16:37 +0000 (11:16 +0100)
1  2 
scripts/shaderlist.txt

Simple merge