Skip to content
Snippets Groups Projects
  1. Oct 20, 2017
  2. Oct 19, 2017
  3. Oct 18, 2017
  4. Oct 17, 2017
    • Tim Martin's avatar
      Merge tag 'release/21.1.17' into update-TrigMC-to-21.1.17 · 8ccfcdcf
      Tim Martin authored
      For the following conflicts, most were a case of THIERS=T=21.1.17 or OURS=O=21.0.39
      
       Conflicts:
       T	DataQuality/DataQualityConfigurations/config/HLT/HLTmuon/cosmics_run.config
       T	Event/xAOD/xAODForward/Root/dict/ContainerProxies.cxx
       T	Event/xAOD/xAODForward/xAODForward/selection.xml
       T	Event/xAOD/xAODForward/xAODForward/xAODForwardDict.h
       T	ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/CMakeLists.txt
       T	ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/AFPSiClusterTool.cxx
       T	ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/AFPSiClusterTool.h
       T	ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/src/AFPSiRowColToLocalCSTool.cxx
       O	Projects/Athena/externals.txt
       T	Projects/AthenaP1/externals.txt
       O	Reconstruction/HeavyIonRec/HIRecExample/share/HIRec_jobOptions.py
       O	Tools/ART/python/ART/art_base.py
       O	Tools/ART/python/ART/art_build.py
       O	Tools/ART/python/ART/art_grid.py
       O	Tools/ART/python/ART/art_header.py
       O	Tools/ART/python/ART/art_misc.py
       O	Tools/ART/scripts/art-task-build.sh
       O	Tools/ART/scripts/art-task-grid.sh
       O	Tools/ART/scripts/art.py
       O	Tools/ART/share/localSetupART.sh
      8ccfcdcf
    • Veronique Boisvert's avatar
      Merge branch 'update-TrigMC-to-21.0.39' into '21.0-TrigMC' · 17d8683a
      Veronique Boisvert authored
      Update TrigMC to 21.0.39
      
      See merge request !5489
      17d8683a
    • Tim Martin's avatar
      Merge tag 'release/21.0.39' into update-TrigMC-to-21.0.39 · ee5ce419
      Tim Martin authored
      Not sure why PixelMonitoring conflicted. Taken all changes from 21.0.39
      
       Conflicts:
      	InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/HolderTemplate.h
      	InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMainMon.h
      	InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiMaps.h
      	InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DLumiProfiles.h
      	InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DMapsLW.h
      	InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMon2DProfilesLW.h
      	InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelMonModules.h
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/Errors.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMainMon.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiMaps.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DLumiProfiles.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DMapsLW.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMon2DProfilesLW.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelMonModules.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/Status.cxx
      	InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
      	Projects/Athena/version.txt
      	Projects/AthenaP1/externals.txt
      ee5ce419
  5. Oct 10, 2017
  6. Oct 09, 2017
  7. Oct 08, 2017
  8. Oct 07, 2017
  9. Oct 06, 2017
Loading