]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into divVerent/opera-by-morphed
authorRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 10:15:38 +0000 (12:15 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 15 May 2012 10:15:38 +0000 (12:15 +0200)
1  2 
scripts/shaderlist.txt

Simple merge