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)
Conflicts:
defaultXonotic.cfg

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge