]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge