]> 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: 6212ea1 1ecbcab)
Merge remote branch 'origin/terencehill/hud_config_fixes'
authorSamual <samual@xonotic.org>
Fri, 27 Jan 2012 00:22:12 +0000 (19:22 -0500)
committerSamual <samual@xonotic.org>
Fri, 27 Jan 2012 00:22:12 +0000 (19:22 -0500)

Trivial merge