]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into matthiaskrgr/unsealedtrial3
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 21 Jun 2014 18:46:35 +0000 (20:46 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 21 Jun 2014 18:46:35 +0000 (20:46 +0200)
1  2 
scripts/shaderlist.txt

Simple merge