Merge branch 'master' into mirceakitsune/multijump
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 9 Aug 2010 11:27:26 +0000 (14:27 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 9 Aug 2010 11:27:26 +0000 (14:27 +0300)
commit992529cda6e328df91113b580eae2f1b3ef0cdfd
tree9e6b22a2c7eb3898ff31191dfe9da260bcc474b2
parentf180f73f1a95c739a88856c0279ccfa097f39b71
parentaf161ee97e193b82c3de4da4a98bfa214b6d7e34
Merge branch 'master' into mirceakitsune/multijump

Conflicts:
qcsrc/server/cl_physics.qc
defaultXonotic.cfg
qcsrc/server/cl_physics.qc