]> 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: 5282199 dd6c0f8)
Merge remote-tracking branch 'origin/samual/hud_updates'
authorJakob MG <jakob_mg@hotmail.com>
Wed, 26 Oct 2011 07:11:34 +0000 (09:11 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Wed, 26 Oct 2011 07:11:34 +0000 (09:11 +0200)

Trivial merge