]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: defaf2b 017f6ab)
Merge branch 'master' into sev/hud_kh
authorMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 08:12:07 +0000 (19:12 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 08:12:07 +0000 (19:12 +1100)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history

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