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)
commite3e13a6eac82464c004af16230f1da2b92776636
tree1f530875e2239e776b72be17b3333ea595cb7a3f
parent4aabbcbfcb5d689c7553db92012b7db84b867afa
parentd17eaa6d6ed46e500a49bf04e336e1a4379a9457
Merge remote branch 'origin/master' into terencehill/infinite_ammo
qcsrc/client/hud.qc