]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into terencehill/infinite_ammo
authorSamual <samual@xonotic.org>
Wed, 17 Aug 2011 01:34:22 +0000 (21:34 -0400)
committerSamual <samual@xonotic.org>
Wed, 17 Aug 2011 01:34:22 +0000 (21:34 -0400)
1  2 
qcsrc/client/hud.qc

Simple merge