Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

4fa573b3

Commit 4fa573b3 authored 7 years ago by Davide Gerbaudo

Downloads
- Patches
- Plain Diff

Merge branch 'TM-May10_2' into '21.1'

ATR-16289, Adding a dash to name of L1_SC items

See merge request !1613

parent df98124a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py 6 additions, 2 deletions

Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py 4 additions, 4 deletions

.../TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py
Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py 6 additions, 6 deletions

Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v7.py
Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py 34 additions, 34 deletions

...er/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml 2 additions, 2 deletions

...TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml 2 additions, 2 deletions

...erCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml

with 54 additions and 50 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