Conflicts:
	balance25.cfg
	balanceFruitieX.cfg
	balanceXDF.cfg
	balanceXPM.cfg
	balanceXonotic.cfg
	defaultXonotic.cfg
	qcsrc/client/View.qc
	qcsrc/client/autocvars.qh
	qcsrc/client/waypointsprites.qc
	qcsrc/client/weapons/projectile.qc
	qcsrc/common/constants.qh
	qcsrc/common/notifications.qh
	qcsrc/common/weapons/all.qh
	qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
	qcsrc/server/cl_weapons.qc
	qcsrc/server/miscfunctions.qc
	qcsrc/server/mutators/mutator_instagib.qc
	qcsrc/server/mutators/mutator_nades.qc
	qcsrc/server/mutators/mutator_nades.qh
	qcsrc/server/progs.src
	qcsrc/server/weapons/weaponsystem.qc