]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'matthiaskrgr/shader_stuff' into matthiaskrgr/unsealedtrial2
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 6 Aug 2013 21:39:03 +0000 (23:39 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 6 Aug 2013 21:39:03 +0000 (23:39 +0200)
commit27f3cab806fd9255df6ae75958778af7a8b54306
treedc2a74eb4ab24ba92a7a5de54edabcb5612bf99f
parentffde16b7bfe1911521b78b19357304ff88ccf2ec
parent8e232991fbb70e7f2f48a96f14ac47e127bd78c1
Merge branch 'matthiaskrgr/shader_stuff' into matthiaskrgr/unsealedtrial2