Merge branch 'master' into terencehill/infinite_ammo
authorterencehill <piuntn@gmail.com>
Thu, 19 May 2011 17:07:27 +0000 (19:07 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 19 May 2011 17:07:27 +0000 (19:07 +0200)
commit4aabbcbfcb5d689c7553db92012b7db84b867afa
treede6b148300a1fde5e1686491be6eb5fe4999945b
parent9e40ca55417d486a60b0737d8d52689cf7488b8a
parentc96303a4cf08c3a73d9f111f81cb915bc06ae510
Merge branch 'master' into terencehill/infinite_ammo

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qc