Merge branch 'master' into terencehill/dynamic_hud
authorterencehill <piuntn@gmail.com>
Sat, 26 Mar 2016 23:30:20 +0000 (00:30 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 26 Mar 2016 23:30:20 +0000 (00:30 +0100)
commit834fed09016056ff2cd32d1980f0719d09c403a2
tree8660de14fc848a57cf7a996b2fc7633b5cc437b1
parent4c5c55d15ec9ac8d7a6e3575643d3aa7be612df7
parent112e1861bef236521b5fc092d9a2f3114c7f4304
Merge branch 'master' into terencehill/dynamic_hud

Conflicts:
qcsrc/client/quickmenu.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud/hud.qc
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/racetimer.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/minigames/cl_minigames_hud.qc