git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

Merge branch 'master' into Mario/physics

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_buffs.qc	\|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_buffs.qh	\|	diff2 \|	blob \| history