Merge remote branch 'origin/master' into terencehill/essential_weapons_panel
authorSamual <samual@xonotic.org>
Wed, 17 Aug 2011 01:13:18 +0000 (21:13 -0400)
committerSamual <samual@xonotic.org>
Wed, 17 Aug 2011 01:13:18 +0000 (21:13 -0400)
commit6491d84c152f73b11edbd0c5a74317461b0045cb
tree30eff6ed2b2bcd2716db86ac7b8ef707d72d37b7
parent0e5cbf515429d0f2c0ca3324d566edfb986094d7
parentd17eaa6d6ed46e500a49bf04e336e1a4379a9457
Merge remote branch 'origin/master' into terencehill/essential_weapons_panel

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