]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - gfx/hud/default/buff_disability.tga
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ecebca b6b2f6f)
Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Wed, 5 Aug 2015 13:07:22 +0000 (23:07 +1000)
committerMario <zacjardine@y7mail.com>
Wed, 5 Aug 2015 13:07:22 +0000 (23:07 +1000)
commit0e11fe379dc3d256b0041886893a0e35b70c86d9
tree15bc3b5f82075114188366606981e5114b85f0e6tree | snapshot
parent7ecebcaed42364cf2c048c484ef4c7c173f62748commit | diff
parentb6b2f6f6a9fa502c524c474db6510bc998ba861acommit | diff
Merge branch 'master' into Mario/buff_updates

# Conflicts:
# _hud_descriptions.cfg
# hud_luma.cfg
# hud_luminos.cfg
# hud_luminos_minimal.cfg
# hud_luminos_minimal_xhair.cfg
# hud_luminos_old.cfg
# hud_nexuiz.cfg
# qcsrc/client/hud.qc
# qcsrc/client/hud.qh
_hud_descriptions.cfg diff1 | diff2 | blob | history
hud_luma.cfg diff1 | diff2 | blob | history
hud_luminos.cfg diff1 | diff2 | blob | history
hud_luminos_minimal.cfg diff1 | diff2 | blob | history
hud_luminos_minimal_xhair.cfg diff1 | diff2 | blob | history
hud_luminos_old.cfg diff1 | diff2 | blob | history
hud_nexuiz.cfg diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh diff1 | diff2 | blob | history
qcsrc/client/hud.qc diff1 | diff2 | blob | history
qcsrc/client/hud.qh diff1 | diff2 | blob | history
qcsrc/client/hud_config.qc diff1 | diff2 | blob | history