Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 10 May 2011 23:09:07 +0000 (02:09 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 10 May 2011 23:09:07 +0000 (02:09 +0300)
commitd6d052a48359a46ac57774650797e6cc6a6d7f31
tree20496a5ab94eb636a73bb28de97555129b5610cf
parentc4cb3b3af3770d7629b3cef9332e06129294bb3a
parente2daf8d138855a357293af335c1406ac2f808870
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc