Merge branch 'master' into terencehill/infomessages_panel_update
authorterencehill <piuntn@gmail.com>
Thu, 23 Jun 2016 16:58:13 +0000 (18:58 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 23 Jun 2016 16:58:13 +0000 (18:58 +0200)
1  2 
_hud_common.cfg

diff --cc _hud_common.cfg
Simple merge