Merge remote branch 'origin/master' into fruitiex/animations
authorSamual <samual@xonotic.org>
Thu, 18 Aug 2011 07:58:57 +0000 (03:58 -0400)
committerSamual <samual@xonotic.org>
Thu, 18 Aug 2011 07:58:57 +0000 (03:58 -0400)
commit8ba8bed747f6303d3724c1aedb4be994b1e87455
treec4d39ca92b9b3ff24867a99994ad9de56755d86a
parent6a6e16c95e08e57dd6c1534f12bf95a39db92353
parent31732fe76f43c42412d80a6543ebd6939cd5b68f
Merge remote branch 'origin/master' into fruitiex/animations

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh
qcsrc/server/t_jumppads.qc
qcsrc/server/w_shotgun.qc