]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into...
authorMaik Merten <maikmerten@googlemail.com>
Wed, 20 Jun 2012 17:44:05 +0000 (19:44 +0200)
committerMaik Merten <maikmerten@googlemail.com>
Wed, 20 Jun 2012 17:44:05 +0000 (19:44 +0200)
1  2 
scripts/shaderlist.txt

Simple merge