]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/unsealed
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 20 Feb 2016 15:48:17 +0000 (16:48 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 20 Feb 2016 15:48:17 +0000 (16:48 +0100)
commit8df991e2cf4d27642296fe53fe0da54eff39aaf2
tree4a40d639a800af9119d412cd0767b68f6b2ab97e
parent052d488d167bba75a6de812ac9eda4be04f8373e
parent64c85aedb50c19f5c39f1456101b738f9cbcf33e
Merge branch 'master' into matthiaskrgr/unsealed
scripts/model_crystals.shader
scripts/shaderlist.txt