]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de6b7b1 e4898a2)
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)

Trivial merge