Merge branch 'master' into samual/weapons
authorRudolf Polzer <divverent@xonotic.org>
Thu, 16 Oct 2014 09:50:07 +0000 (11:50 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 16 Oct 2014 09:50:07 +0000 (11:50 +0200)
commita5b077eb799e456094034cdc0dd0d5b5a7e1119e
tree5ff84c288efc83b37a6db8716df4d56d6d56e28b
parent7a9f1a27f889cb7fa9325f2daefe8a8abb4e9edd
parent14f88293289444c9a39357a88c1980c019733eff
Merge branch 'master' into samual/weapons

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc