]> 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: ef0b180 fa0c6af)
Merge remote branch 'origin/mirceakitsune/damage_effects'
authorSamual <samual@xonotic.org>
Fri, 20 Jan 2012 01:37:53 +0000 (20:37 -0500)
committerSamual <samual@xonotic.org>
Fri, 20 Jan 2012 01:37:53 +0000 (20:37 -0500)

Trivial merge