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)
commit3e21073f2bd7f282947bc1f214b3ec25d69ccae0
tree7bfdefa82c4eeafae8ea77da50da1b8ec78da2da
parent049506acb232778b3d665c4abf13f0fd63cd4709
parent5206a0d182c46393867fe6de80c40c7d00e97146
Merge branch 'master' into terencehill/scoreboard_panel_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