]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Apr 2011 21:52:53 +0000 (00:52 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Apr 2011 21:52:53 +0000 (00:52 +0300)
commit8896ed7041705fcd44babc2cfb7ad8f931bedcbc
tree96111dac7a7b99e794ccd6cf66a7fa2edab1fd84
parent6d0b92f2bd629d0e83a7b3a37db60863acbc480a
parent396be1f0fd806ebca957a7a065d6934a8e85e0c9
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/server/autocvars.qh