Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bbe5af70

Commit bbe5af70 authored 6 years ago by Stefan Richter

Downloads
- Plain Diff

Merge branch '21.6' of ssh://gitlab.cern.ch:7999/atlas/athena into powhegcontrol_add_ttbb_process

parents 5dc5aeee cf8e959a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Generators/GeneratorFilters/share/common/FindJets.py 15 additions, 2 deletions

Generators/GeneratorFilters/share/common/FindJets.py
Generators/GeneratorFilters/share/common/JetFilter_JZX.py 9 additions, 9 deletions

Generators/GeneratorFilters/share/common/JetFilter_JZX.py
Generators/GeneratorFilters/share/common/QCDJetFilter.py 1 addition, 0 deletions

Generators/GeneratorFilters/share/common/QCDJetFilter.py
Generators/Herwig7_i/Herwig7_i/Herwig7.h 3 additions, 0 deletions

Generators/Herwig7_i/Herwig7_i/Herwig7.h
Projects/AthGeneration/CMakeLists.txt 11 additions, 0 deletions

Projects/AthGeneration/CMakeLists.txt
Projects/AthGeneration/version.txt 1 addition, 1 deletion

Projects/AthGeneration/version.txt

with 40 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