Merge branch 'master' into mirceakitsune/multijump
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 26 Apr 2010 21:38:04 +0000 (00:38 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 26 Apr 2010 21:38:04 +0000 (00:38 +0300)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_physics.qc

Simple merge
Simple merge