]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/dynamic_hud
authorterencehill <piuntn@gmail.com>
Wed, 23 Mar 2016 21:58:50 +0000 (22:58 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 23 Mar 2016 21:58:50 +0000 (22:58 +0100)
commitf72821fdcebe3ca01181a99727a06198de65ea08
tree2b7bf2b47b6248577eb3d36198d41c5447b9f5ff
parent65ae427fd5062ffc930114fa14275ec96eec01b0
parentcbdb7a96d12e868b8de189ac2a93172ec7a01acb
Merge branch 'master' into terencehill/dynamic_hud

Conflicts:
qcsrc/client/view.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qh
qcsrc/client/hud/hud_config.qc
qcsrc/client/main.qc
qcsrc/client/view.qc
qcsrc/menu/xonotic/dialog_settings_game_hud.qc