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

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

Merge branch 'master' into TimePath/experiments/csqc_prediction

Conflicts:
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/common/csqcmodel_settings.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/dpdefs/csprogsdefs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_plats.qc	diff1 \|	diff2 \|	blob \| history

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/common/csqcmodel_settings.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/dpdefs/csprogsdefs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_plats.qc	diff1 \|	diff2 \|	blob \| history