]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 22 Apr 2011 15:38:58 +0000 (18:38 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 22 Apr 2011 15:38:58 +0000 (18:38 +0300)
commitc4cb3b3af3770d7629b3cef9332e06129294bb3a
tree465cda81160552488479ebd2709502fe12adc401
parent8896ed7041705fcd44babc2cfb7ad8f931bedcbc
parent8e55f49af4ce4e6240f2dd44b5066d2d294fe19a
Merge branch 'master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc