]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/physical_entities
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 11 Jul 2012 19:24:05 +0000 (22:24 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 11 Jul 2012 19:24:05 +0000 (22:24 +0300)
commit97ee6130a24f5452a61eec2310bd14f8390ceb4f
tree8a32b2d25cdc798f00c8d54e67427c041483424b
parentaa567df8fe657e09850b52f45dc7a939913ce7cb
parentc3ec1741fd95b47daee57588acd067a1eefc3239
Merge branch 'master' into mirceakitsune/physical_entities

Conflicts:
qcsrc/server/t_items.qc
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/t_items.qc