]> 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: 8ca52c0 298665e)
Merge remote-tracking branch 'origin/terencehill/misc_hud_fixes'
authorSamual Lenks <samual@xonotic.org>
Fri, 8 Mar 2013 22:08:18 +0000 (17:08 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 8 Mar 2013 22:08:18 +0000 (17:08 -0500)
1  2 
_hud_descriptions.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history

diff --cc _hud_descriptions.cfg
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge