]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/physical_entities
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 13 May 2012 09:08:03 +0000 (12:08 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 13 May 2012 09:08:03 +0000 (12:08 +0300)
commitaa567df8fe657e09850b52f45dc7a939913ce7cb
tree965eb54669f597edeedb54c4f064413ee70f01d0
parent90a5b3918920a8235311e850fe239044acefe6c8
parent481509839fb065e8854b533da2093424cd058e7e
Merge branch 'master' into mirceakitsune/physical_entities
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/t_items.qc