Merge branch 'master' into terencehill/hud_configure
authorterencehill <piuntn@gmail.com>
Sun, 19 Apr 2015 10:35:13 +0000 (12:35 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 19 Apr 2015 10:35:13 +0000 (12:35 +0200)
commitd7561df40d3fd89c2ddc36317e8fb6b5e90b493d
tree67cf291a4bbe0a338cb389a3856d04a3ca4d3e8f
parentbedc4037f669e55758528498bc1eb19311f6f71c
parent07363585c6bb3da68f60445673e99de355c86807
Merge branch 'master' into terencehill/hud_configure
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc