]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:26:03 +0000 (08:26 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:26:03 +0000 (08:26 +1000)
commit459113c6b47ab71204088b818e745879c0e80b25
treee571a000644ac5f4af69d74f4357f5f071c6ff6a
parent4510cc7248f1192cc057382e924b1cbec279769e
parent4566767f430d7a15f918d80b234f04c71f929b4e
Merge branch 'master' into Mario/buff_updates
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc