]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into matthiaskrgr/unsealedtrial2
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 23 Jul 2013 20:27:52 +0000 (22:27 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 23 Jul 2013 20:27:52 +0000 (22:27 +0200)
1  2 
scripts/shaderlist.txt

Simple merge