Merge branch 'master' into terencehill/dynamic_hud
authorterencehill <piuntn@gmail.com>
Sun, 1 May 2016 07:56:58 +0000 (09:56 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 1 May 2016 07:56:58 +0000 (09:56 +0200)
commit2a38620bbb43f7b62bbd93e8c22b6abbe627ca86
tree2c859e6691bc8a2defb255b48fb91abae6c11e5c
parent61d746760851b92ea6124dcc179c0f5178b62169
parentc914a05e8e91853fe003d7d03b1f3ddbf0881f39
Merge branch 'master' into terencehill/dynamic_hud
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud/panel/weapons.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/common/minigames/cl_minigames_hud.qc
qcsrc/common/mutators/mutator/damagetext/damagetext.qc