]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into divVerent/opera-by-morphed
authorRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 10:23:58 +0000 (11:23 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 6 Dec 2011 10:23:58 +0000 (11:23 +0100)
1  2 
scripts/shaderlist.txt

Simple merge