Build/AtlasBuildScripts/checkout_Gaudi.sh · 83ee1aa1c888f5ab93a4aa17dbb22e51d3704a91 · Lawrence Davou Christopher / athena

Forked from atlas / athena

Source project has a limited visibility.

7 years ago

Merge remote-tracking branch 'upstream/21.1' into update-21.0-TrigMC-to-EndOfYear-21.1 · 41262f72

Tim Martin authored 7 years ago

Updates TrigMC to 21.1.20 plus development after that point.

--- END OF YEAR 2017 SYNC ---

 Conflicts:
	InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
	InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
	Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py


Former-commit-id: 4e4812907f04a2bf1447ee9934d633f92ac026bd

41262f72

History

Merge remote-tracking branch 'upstream/21.1' into update-21.0-TrigMC-to-EndOfYear-21.1

Tim Martin authored 7 years ago

Updates TrigMC to 21.1.20 plus development after that point.

--- END OF YEAR 2017 SYNC ---

 Conflicts:
	InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
	InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
	Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py


Former-commit-id: 4e4812907f04a2bf1447ee9934d633f92ac026bd

Code owners

Assign users and groups as approvers for specific file changes. Learn more.