Merge remote-tracking branch 'upstream/master' into ATR_21882_topo_excl (cc9d41e6) · Commits · atlas / athena

Commit cc9d41e6 authored 4 years ago by Debottam Bakshi Gupta

Browse files

Merge remote-tracking branch 'upstream/master' into ATR_21882_topo_excl

parents da2598bd 963789e2

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt 1 addition, 1 deletion

AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt
AtlasGeometryCommon/SubDetectorEnvelopes/SubDetectorEnvelopes/IEnvelopeDefSvc.h 8 additions, 6 deletions

...bDetectorEnvelopes/SubDetectorEnvelopes/IEnvelopeDefSvc.h
AtlasTest/GoogleTestTools/CMakeLists.txt 4 additions, 6 deletions

AtlasTest/GoogleTestTools/CMakeLists.txt
AtlasTest/GoogleTestTools/share/GoogleTestToolsTests.ref 6 additions, 7 deletions

AtlasTest/GoogleTestTools/share/GoogleTestToolsTests.ref
Calorimeter/CaloSimEvent/CaloSimEvent/ATLAS_CHECK_THREAD_SAFETY 1 addition, 0 deletions

...meter/CaloSimEvent/CaloSimEvent/ATLAS_CHECK_THREAD_SAFETY
Calorimeter/CaloSimEvent/CaloSimEvent/CaloCalibrationHit.h 7 additions, 7 deletions

Calorimeter/CaloSimEvent/CaloSimEvent/CaloCalibrationHit.h
Calorimeter/CaloSimEvent/src/CaloCalibrationHitContainer.cxx 1 addition, 1 deletion

Calorimeter/CaloSimEvent/src/CaloCalibrationHitContainer.cxx
Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx 3 additions, 3 deletions

...oolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
Control/AthenaCommon/share/bootstrap.pkl 0 additions, 0 deletions

Control/AthenaCommon/share/bootstrap.pkl
Control/AthenaCommon/share/bootstrap_threaded.pkl 0 additions, 0 deletions

Control/AthenaCommon/share/bootstrap_threaded.pkl
Control/AthenaConfiguration/python/ComponentAccumulator.py 79 additions, 37 deletions

Control/AthenaConfiguration/python/ComponentAccumulator.py
Control/AthenaConfiguration/python/JobOptsDumper.py 13 additions, 0 deletions

Control/AthenaConfiguration/python/JobOptsDumper.py
Control/AthenaConfiguration/python/MainServicesConfig.py 4 additions, 2 deletions

Control/AthenaConfiguration/python/MainServicesConfig.py
Control/AthenaConfiguration/share/confTool.py 2 additions, 2 deletions

Control/AthenaConfiguration/share/confTool.py
Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/IMyPackageTool.h 0 additions, 0 deletions

...amples/AthAsgExUnittest/AthAsgExUnittest/IMyPackageTool.h
Control/AthenaExamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageTool.h 7 additions, 7 deletions

...xamples/AthAsgExUnittest/AthAsgExUnittest/MyPackageTool.h
Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt 17 additions, 10 deletions

Control/AthenaExamples/AthAsgExUnittest/CMakeLists.txt
Control/AthenaExamples/AthAsgExUnittest/Root/MyPackageTool.cxx 3 additions, 4 deletions

...ol/AthenaExamples/AthAsgExUnittest/Root/MyPackageTool.cxx
Control/AthenaExamples/AthAsgExUnittest/src/MyPackageAlg.h 7 additions, 7 deletions

Control/AthenaExamples/AthAsgExUnittest/src/MyPackageAlg.h
Control/AthenaExamples/AthAsgExUnittest/src/components/AthAsgExUnittest_entries.cxx 5 additions, 4 deletions

...AsgExUnittest/src/components/AthAsgExUnittest_entries.cxx

with 168 additions and 104 deletions

Please register or to comment