]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5de94e 6a28c11)
Merge branch 'master' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 11 Oct 2013 15:40:33 +0000 (17:40 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 11 Oct 2013 15:40:33 +0000 (17:40 +0200)

Trivial merge