Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 14 Jan 2012 10:22:29 +0000 (12:22 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 14 Jan 2012 10:22:29 +0000 (12:22 +0200)
commit365bcf446f6fcee37715b550147b549bd5f8955f
tree5e45275c8542355b51a8da9dad3961f38b9b8475
parent755b3f19f8d8d28556de4d04151221c04e37bb0c
parent59c6397f642469ec6ed72a83b658644ffa8c4205
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/common/util.qh
qcsrc/server/cl_player.qc
qcsrc/server/vehicles/raptor.qc
qcsrc/server/w_minstanex.qc