Merge remote-tracking branch 'origin/master' into fruitiex/animations
authorFruitieX <fruitiex@gmail.com>
Thu, 9 Jun 2011 11:47:22 +0000 (14:47 +0300)
committerFruitieX <fruitiex@gmail.com>
Thu, 9 Jun 2011 11:47:22 +0000 (14:47 +0300)
Conflicts:
defaultXonotic.cfg
qcsrc/server/cl_weaponsystem.qc

1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge