]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 3 Apr 2011 22:36:08 +0000 (01:36 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 3 Apr 2011 22:36:08 +0000 (01:36 +0300)
commite05f7f73cad1d34d22a6b5db420d9491165084fa
treeaf906007dd4c60f753499f34203d81d02e5c3e35
parent29c5aee553e1cf717bb1f576973b11b9b0f3fc4e
parent0731fd69a669075745c22c9e7e8413fe05583b50
Merge branch 'master' into mirceakitsune/damage_effects