]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'mirceakitsune/damage_effects' of git://de.git.xonotic.org/xonotic/xonot...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 16 Jan 2012 20:17:11 +0000 (22:17 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 16 Jan 2012 20:17:11 +0000 (22:17 +0200)
1  2 
qcsrc/client/damage.qc

Simple merge