]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 12 Apr 2011 17:17:08 +0000 (20:17 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 12 Apr 2011 17:17:08 +0000 (20:17 +0300)
commit6d0b92f2bd629d0e83a7b3a37db60863acbc480a
tree1aaff5fe5ed0376c1f405a8540cdbe5749357d08
parent594ccfa3382b16ee49d794043973c13ed4229dbd
parentf7f36e7cb72f1c9709219b1fdc52e3f5dc3748d3
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg