]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40500b7 5048c32)
Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)

Trivial merge