Merge branch 'manualSweep25182' into 'master' (c7b08550) · Commits · Shaun Roe / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c7b08550

Commit c7b08550 authored 5 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'manualSweep25182' into 'master'

Forward port ATLASG-1450 to master (supersedes !25206)

See merge request atlas/athena!25220

parents 80d4e5e2 61fd73af

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/CMakeLists.txt 2 additions, 1 deletion

...rivationFramework/DerivationFrameworkTools/CMakeLists.txt
PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/DerivationFrameworkTools/PrescaleTool.h 2 additions, 1 deletion

...ionFrameworkTools/DerivationFrameworkTools/PrescaleTool.h
PhysicsAnalysis/DerivationFramework/DerivationFrameworkTools/src/PrescaleTool.cxx 4 additions, 10 deletions

...onFramework/DerivationFrameworkTools/src/PrescaleTool.cxx

with 8 additions and 12 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