]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Jan 2012 12:21:05 +0000 (14:21 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 5 Jan 2012 12:21:05 +0000 (14:21 +0200)
commitd03bf59652dab079deef7cf35e5b80599b13df05
tree511c55de3b424dbfdcbc8a2eeac0613efab0c49d
parent948221c60f54a78c311f9210ca7721b5c224d1fb
parent1b8067ffcc792adb987ffdd1a94a9cd834882c7b
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/damage.qc
qcsrc/common/util.qh
qcsrc/server/cl_player.qc