]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/unsealed
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 7 Sep 2015 02:06:54 +0000 (04:06 +0200)
commitf6f5f74271087f9846f5c1d70bfa509c8924642d
tree6af2167ec98099b5b731b25a4ecacde9b73b163e
parentdd4e3e60e4243d30a82447247cc7e6c1fb3d8285
parentd19632f74c8e3adc96792001ea3acb726ed0778a
Merge branch 'master' into matthiaskrgr/unsealed
scripts/shaderlist.txt
scripts/trak5x.shader