Merge branch 'master' into terencehill/hud_fixes 294/head
authorterencehill <piuntn@gmail.com>
Sat, 26 Mar 2016 00:08:01 +0000 (01:08 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 26 Mar 2016 00:08:01 +0000 (01:08 +0100)
commit109c5785a22fb4336ac5e91d5f1fa91678582164
treee0bc5ae86eb1e67b8f693ae78d06104548dca6f8
parent6f4c7132e635c0150e3894f2f9958b361ce0c238
parent237c805e8c20023df4ea321d2b6bedb6998935b5
Merge branch 'master' into terencehill/hud_fixes

# Conflicts:
# qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qc
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/hud/panel/racetimer.qc