]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commit7bc4a41533bf669d862edc94c15515bec2796481
tree596e381d1052af51f42ec1ab9d8a4159526d1993
parentc3054920397079a29f0c8f7c9c43e0e9200aefee
parent9a2422e178f8da24ddfd6d38173a6123e25a6d26
Merge branch 'master' into matthiaskrgr/unsealedtrial3
scripts/shaderlist.txt