]> de.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: 365bcf4 8b553f0)
Merge branch 'mirceakitsune/damage_effects' of git://de.git.xonotic.org/xonotic/xonot...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 14 Jan 2012 10:24:26 +0000 (12:24 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 14 Jan 2012 10:24:26 +0000 (12:24 +0200)

Trivial merge