Merge branch 'LCG97aUpdate-master-20200715' into 'master' (52722fb6) · Commits · Peter Sherwood / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

52722fb6

Commit 52722fb6 authored 4 years ago by Edward Moyse

Downloads
- Plain Diff

Merge branch 'LCG97aUpdate-master-20200715' into 'master'

LCG_97a Update, master branch (2020.07.16.)

See merge request atlas/athena!34839

parents 9de594ab 1ff8ce79

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Generators/Tauolapp_i/CMakeLists.txt 4 additions, 18 deletions

Generators/Tauolapp_i/CMakeLists.txt
HLT/Trigger/TrigControl/TrigPSC/src/Config.cxx 8 additions, 5 deletions

HLT/Trigger/TrigControl/TrigPSC/src/Config.cxx
Projects/AthDataQuality/CMakeLists.txt 1 addition, 1 deletion

Projects/AthDataQuality/CMakeLists.txt
Projects/AthGeneration/build_externals.sh 12 additions, 12 deletions

Projects/AthGeneration/build_externals.sh
Projects/AthSimulation/build_externals.sh 1 addition, 1 deletion

Projects/AthSimulation/build_externals.sh
Projects/Athena/CMakeLists.txt 2 additions, 2 deletions

Projects/Athena/CMakeLists.txt
Projects/Athena/build_externals.sh 12 additions, 12 deletions

Projects/Athena/build_externals.sh
Projects/Athena/cmake/NumPyEnvironmentConfig.cmake 7 additions, 1 deletion

Projects/Athena/cmake/NumPyEnvironmentConfig.cmake
Projects/VP1Light/build_externals.sh 1 addition, 1 deletion

Projects/VP1Light/build_externals.sh
Reconstruction/Jet/JetRecTools/Root/ConstituentSubtractorTool.cxx 6 additions, 10 deletions

...uction/Jet/JetRecTools/Root/ConstituentSubtractorTool.cxx

with 54 additions and 63 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment