Merge branch 'cherry-pick-e75f7dc4' into '21.0' (be865bbb) · Commits · atlas / athena · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Jira

Snippets Groups Projects

be865bbb

Commit be865bbb authored 7 years ago by Hass AbouZeid

Downloads
- Plain Diff

Merge branch 'cherry-pick-e75f7dc4' into '21.0'

Merge branch 'rebase_doxygen' into '21.1'

See merge request !2499

parents 6cafd5de 52f3d9c7

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Trigger/TrigAlgorithms/TrigAFPReco/TrigAFPReco/Trig_AFPSiTrkReco.h 33 additions, 1 deletion

...rigAlgorithms/TrigAFPReco/TrigAFPReco/Trig_AFPSiTrkReco.h
Trigger/TrigAlgorithms/TrigAFPReco/src/Trig_AFPSiTrkReco.cxx 13 additions, 7 deletions

Trigger/TrigAlgorithms/TrigAFPReco/src/Trig_AFPSiTrkReco.cxx
Trigger/TrigHypothesis/TrigAFPHypo/TrigAFPHypo/TrigAFPJetAllTE.h 96 additions, 0 deletions

.../TrigHypothesis/TrigAFPHypo/TrigAFPHypo/TrigAFPJetAllTE.h

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