]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/hud_cleanups
authorterencehill <piuntn@gmail.com>
Wed, 14 Oct 2015 19:38:55 +0000 (21:38 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 14 Oct 2015 19:38:55 +0000 (21:38 +0200)
commit21307f327df5609b82d90496c1c6156d636d1c8d
treeab1c08538145ea6fbe5fed4801e4a438aa289f99
parent7b0290e8ce71067769672555e9233f720b463bdb
parent26e4227521bef3540881c326dd68b546bef62bcd
Merge branch 'master' into terencehill/hud_cleanups
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/hud_config.qc
qcsrc/client/view.qc
qcsrc/common/minigames/cl_minigames_hud.qc
qcsrc/common/vehicles/vehicle/bumblebee.qc
qcsrc/common/vehicles/vehicle/racer.qc
qcsrc/common/vehicles/vehicle/raptor.qc
qcsrc/common/vehicles/vehicle/spiderbot.qc