Merge branch 'master' into terencehill/scoreboard_update
authorterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 23:20:48 +0000 (01:20 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 31 Aug 2016 23:20:48 +0000 (01:20 +0200)
commit13ef8c684799d97835cac8437ed3d90e85a92e7e
treec069ca5ae939b4a5f3cf1097ae4e796aecaf0f87
parentbe9b8f4fd280a78e151e38eab61cda9008f219b7
parentb127e12b81c493f8cb77e886160722b78a0acee5
Merge branch 'master' into terencehill/scoreboard_update
qcsrc/client/hud/panel/scoreboard.qc