Merge branch 'master' into terencehill/quickmenu
authorMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 04:32:07 +0000 (14:32 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 04:32:07 +0000 (14:32 +1000)
commit6cc2d1aa115907d16ae84fb07c3fe6c3329cd9b5
treead0245382a00940dd6e4ca9496a1591330e0d672
parent019741fe95d61aad25d0e320a7da7929c00587f4
parentcc829528986909cb96fe28b65b6d447f27235b65
Merge branch 'master' into terencehill/quickmenu

# Conflicts:
# qcsrc/client/command/cl_cmd.qc
qcsrc/client/command/cl_cmd.qc
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc
qcsrc/client/main.qc
qcsrc/client/scoreboard.qc
qcsrc/client/view.qc
qcsrc/server/command/cmd.qc