]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitb9892287df60503128fd17f1be8289b44243e179
tree888b191d394ab9784b70eec2797ea2dd3272a397
parent365bcf446f6fcee37715b550147b549bd5f8955f
parent8b553f0dc135151cf76e0277739a2118e4a31b0c
Merge branch 'mirceakitsune/damage_effects' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into mirceakitsune/damage_effects