]> 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: 74ba1d2 ad4f3c4)
Merge branch 'master' into matthiaskrgr/hudsetup
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 25 Sep 2013 21:58:39 +0000 (23:58 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 25 Sep 2013 21:58:39 +0000 (23:58 +0200)

Trivial merge