]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'remotes/origin/terencehill/newpanelhud-dom_points' into terenceh...
authorterencehill <piuntn@gmail.com>
Wed, 3 Nov 2010 19:20:56 +0000 (20:20 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 3 Nov 2010 19:20:56 +0000 (20:20 +0100)
1  2 
qcsrc/client/hud.qc

Simple merge