Merge remote-tracking branch 'origin/master' into fruitiex/animations
authorFruitieX <fruitiex@gmail.com>
Thu, 29 Sep 2011 19:09:10 +0000 (22:09 +0300)
committerFruitieX <fruitiex@gmail.com>
Thu, 29 Sep 2011 19:09:10 +0000 (22:09 +0300)
commit1b2f61baeeff5a7d004fafd3cfdd8269a0338a1e
tree4be14a24f1fb406aaabcc957cdabc781fb244915
parent585387cb47119277a6c3edfeea4a9bcff17481f8
parenta9f034bd247570b2b06c435599db8e283c1a42de
Merge remote-tracking branch 'origin/master' into fruitiex/animations
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/w_shotgun.qc