Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bc1135fc

Commit bc1135fc authored 6 years ago by Adam Edward Barton

Downloads
- Plain Diff

Merge branch 'clidsvc.GeoModelExamples-20180929' into 'master'

GeoModelExamples: CLIDSvc -> AthenaKernel

See merge request atlas/athena!14609

Former-commit-id: 58a92564

parents 08ed7e9b 77578f38

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

DetectorDescription/GeoModel/GeoModelExamples/CMakeLists.txt 3 additions, 4 deletions

DetectorDescription/GeoModel/GeoModelExamples/CMakeLists.txt
DetectorDescription/GeoModel/GeoModelExamples/GeoModelExamples/ToyDetectorManager.h 1 addition, 1 deletion

...el/GeoModelExamples/GeoModelExamples/ToyDetectorManager.h

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