]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into mirceakitsune/damage_effects
authorSamual <samual@xonotic.org>
Thu, 12 Jan 2012 19:00:00 +0000 (14:00 -0500)
committerSamual <samual@xonotic.org>
Thu, 12 Jan 2012 19:00:00 +0000 (14:00 -0500)
commit7b976c2b363a9f5b8d17373c7ef290aa0c498372
treeba1578f956f1db5c814e414bc526149694c309cf
parent755b3f19f8d8d28556de4d04151221c04e37bb0c
parent7dc4c6ee1f6581a922aa18e5cd3edc33d76ec2dc
Merge remote branch 'origin/master' into mirceakitsune/damage_effects

Conflicts:
qcsrc/common/util.qh
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/common/util.qh
qcsrc/server/cl_player.qc