]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/unsealedtrial3
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 26 Aug 2015 21:30:46 +0000 (23:30 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 26 Aug 2015 21:30:46 +0000 (23:30 +0200)
commitf4fd5c4ef0f2e573b0de336143919eba30304b4a
treeefa80e60cbd327bb8223d0904a33b6430e0e9f35
parent7bc4a41533bf669d862edc94c15515bec2796481
parentd52e81c2caef88f7bf1db069562e34be7c7833b8
Merge branch 'master' into matthiaskrgr/unsealedtrial3
scripts/crystals.shader
scripts/shaderlist.txt