]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit3e3baa2f19b654ab2982198e00ea8b09f885c66d
tree46c092479ac3f743eb6c65d880abe712024142e6
parentef0b1804069b8d29084bb863197b371457e669c1
parentfa0c6afce104a7e0afa9a40c5dc4b7b66d76fa22
Merge remote branch 'origin/mirceakitsune/damage_effects'