]> 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, 10 Apr 2011 16:22:08 +0000 (19:22 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 10 Apr 2011 16:22:08 +0000 (19:22 +0300)
commit3f59fe8b606a41c772fd053c127199f0808b06f4
tree9e94c724c89d8b2b46574fd645c002391ce3a5f4
parentc8955b373d56636be66557ac118f8e64fc4e6f6a
parent00f45c5adc0efe49e799a3aef81d1d6fe540a90d
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg