Merge branch 'clidsvc.ZdcIdentifier-20181016' into 'master' (fd844418) · 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

fd844418

Commit fd844418 authored 6 years ago by Walter Lampl

Downloads
- Plain Diff

Merge branch 'clidsvc.ZdcIdentifier-20181016' into 'master'

ZdcIdentifier: CLIDSvc -> AthenaKernel

See merge request atlas/athena!15050

Former-commit-id: 859a6b8c

parents 232642b3 00aabc3b

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

ForwardDetectors/ZDC/ZdcIdentifier/CMakeLists.txt 3 additions, 5 deletions

ForwardDetectors/ZDC/ZdcIdentifier/CMakeLists.txt
ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcHardwareID.h 1 addition, 1 deletion

...Detectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcHardwareID.h
ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID.h 1 addition, 1 deletion

ForwardDetectors/ZDC/ZdcIdentifier/ZdcIdentifier/ZdcID.h

with 5 additions and 7 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