Skip to content

2023-06-29: merge of 23.0 into master

Conflicts resolved by hand

Conflicts:
	Generators/TruthConverters/Root/xAODtoHepMCTool.cxx
	Trigger/EFTracking/EFTrackingSim/TrigHTTConfTools/CMakeLists.txt
	Trigger/EFTracking/FPGATrackSim/FPGATrackSimSGInput/CMakeLists.txt

This sweep contains the following MRs:

Merge request reports