]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 15:41:30 +0000 (17:41 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 15:41:30 +0000 (17:41 +0200)
commit852f80e8f4d65a7a6b57e0790036e09db6051409
tree0a22802a4e6e4452fa65e74c7f837c51b11fc93c
parent21403f1e9510d608415d14bf4348880b9ff42204
parent72e1cbd02172ea7ced1488fb948dcdb5e2d441f2
Merge branch 'master' into mirceakitsune/damage_effects
qcsrc/dpdefs/csprogsdefs.qc
qcsrc/server/cl_player.qc