Merge branch '21.6' into '21.6-jetrec'
# Conflicts: # Generators/Rivet_i/share/setupRivet.sh
Showing
- Generators/Rivet_i/CMakeLists.txt 2 additions, 0 deletionsGenerators/Rivet_i/CMakeLists.txt
- Generators/Sherpa_i/share/Example/MC15.999999.Sherpa_Example.py 1 addition, 1 deletion...tors/Sherpa_i/share/Example/MC15.999999.Sherpa_Example.py
- Generators/Sherpa_i/share/common/2.2.4_Base_Fragment.py 0 additions, 0 deletionsGenerators/Sherpa_i/share/common/2.2.4_Base_Fragment.py
- Generators/Sherpa_i/share/common/2.2.4_NNPDF30NNLO.py 1 addition, 1 deletionGenerators/Sherpa_i/share/common/2.2.4_NNPDF30NNLO.py
- Generators/Sherpa_i/share/common/2.2.5_Base_Fragment.py 0 additions, 0 deletionsGenerators/Sherpa_i/share/common/2.2.5_Base_Fragment.py
- Generators/Sherpa_i/share/common/2.2.5_NNPDF30NNLO.py 1 addition, 1 deletionGenerators/Sherpa_i/share/common/2.2.5_NNPDF30NNLO.py
- Projects/AthDataQuality/externals.txt 1 addition, 1 deletionProjects/AthDataQuality/externals.txt
- Projects/AthDerivation/externals.txt 1 addition, 1 deletionProjects/AthDerivation/externals.txt
- Projects/AthSimulation/externals.txt 1 addition, 1 deletionProjects/AthSimulation/externals.txt
- Projects/Athena/externals.txt 1 addition, 1 deletionProjects/Athena/externals.txt
- Projects/AthenaP1/externals.txt 1 addition, 1 deletionProjects/AthenaP1/externals.txt
- Tools/ART/scripts/art-task-build.sh 19 additions, 13 deletionsTools/ART/scripts/art-task-build.sh
Loading
Please register or sign in to comment