]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into mirceakitsune/fix_chase_damageblur
authorSamual <samual@xonotic.org>
Mon, 17 Oct 2011 18:31:34 +0000 (14:31 -0400)
committerSamual <samual@xonotic.org>
Mon, 17 Oct 2011 18:31:34 +0000 (14:31 -0400)
commitc7b7780a48b5ed5d6bd62099b4d43296c285dacb
tree557e7d2b3fc85924463f70524f9d912b994b6aef
parentde6b7b17ca341321710dba1b07cf26c129df3cd6
parente4898a24a61dedc02720f72c32b164c5ecc6bed6
Merge remote branch 'origin/master' into mirceakitsune/fix_chase_damageblur