]> 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: daaa53f e7e55b1)
Merge remote-tracking branch 'origin/terencehill/hud_code_cleanup'
authorSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:42:56 +0000 (15:42 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 26 Feb 2014 20:42:56 +0000 (15:42 -0500)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud_config.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/client/hud_config.qc
Simple merge