]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffde16b 8e23299)
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)

Trivial merge