Merge remote-tracking branch 'origin/Mario/mutator_minstagib'
authorSamual Lenks <samual@xonotic.org>
Fri, 10 May 2013 00:10:03 +0000 (20:10 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 10 May 2013 00:10:03 +0000 (20:10 -0400)
commitdd26dcda7539f07aae99ec9f6a7c407c7ce43ea6
treead9956b705eb7ddc072ff90657c10d329dc50a0e
parentf8a768f456f516214f724e75fe050ab0cd3d3521
parentefde1592431cbb7506727ddbe47a00ca0fbdce5a
Merge remote-tracking branch 'origin/Mario/mutator_minstagib'
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc