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)
commit62be2a57fa6ca4306e25c5c4400f56af865487e4
tree6dc9d90453c8c2e84d80aefd0ce8c7323eaec709
parent5cb932be0d5513911096f8942d2f50f22531c6f8
parente47137c53e14d6bc1683668580ca31244146e9ce
Merge remote-tracking branch 'origin/master' into fruitiex/animations

Conflicts:
defaultXonotic.cfg
qcsrc/server/cl_weaponsystem.qc
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/defs.qh