Conflicts:
	qcsrc/client/bgmscript.qh
	qcsrc/client/command/cl_cmd.qc
	qcsrc/client/damage.qc
	qcsrc/client/main.qc
	qcsrc/client/progs.src
	qcsrc/client/waypointsprites.qc
	qcsrc/common/constants.qh
	qcsrc/common/physics.qh
	qcsrc/common/triggers/func/breakable.qc
	qcsrc/common/triggers/target/music.qc
	qcsrc/common/triggers/target/spawn.qc
	qcsrc/common/triggers/trigger/jumppads.qc
	qcsrc/common/triggers/trigger/secret.qc
	qcsrc/common/triggers/trigger/secret.qh
	qcsrc/common/triggers/trigger/swamp.qc
	qcsrc/server/constants.qh
	qcsrc/server/g_subs.qc
	qcsrc/server/g_triggers.qc
	qcsrc/server/miscfunctions.qc
	qcsrc/server/progs.src
	qcsrc/server/t_halflife.qc
	qcsrc/server/t_plats.qc