Merge branch 'master' into terencehill/scoreboard_panel_2
authorterencehill <piuntn@gmail.com>
Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 14 Aug 2016 09:48:56 +0000 (11:48 +0200)
1  2 
_hud_common.cfg
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud/hud.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/main.qc
qcsrc/client/view.qc

diff --cc _hud_common.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge