Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

e45af0d5

Commit e45af0d5 authored 6 years ago by Vakhtang Tsulaia

Downloads
- Plain Diff

Merge branch 'master-vp1-arbitraryline-guideline' into 'master'

Master vp1 arbitraryline guideline

See merge request atlas/athena!20594

parents 9b3f20a6 3ddbff09

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/GuideSysController.h 9 additions, 1 deletion

...GuideLineSystems/VP1GuideLineSystems/GuideSysController.h
graphics/VP1/VP1Systems/VP1GuideLineSystems/VP1GuideLineSystems/VP1Lines.h 35 additions, 0 deletions

...ystems/VP1GuideLineSystems/VP1GuideLineSystems/VP1Lines.h
graphics/VP1/VP1Systems/VP1GuideLineSystems/src/GuideSysController.cxx 77 additions, 3 deletions

...VP1Systems/VP1GuideLineSystems/src/GuideSysController.cxx
graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1GuideLineSystem.cxx 10 additions, 1 deletion

...VP1Systems/VP1GuideLineSystems/src/VP1GuideLineSystem.cxx
graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1Lines.cxx 150 additions, 0 deletions

graphics/VP1/VP1Systems/VP1GuideLineSystems/src/VP1Lines.cxx
graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guidelinescontrollerform.ui 75 additions, 57 deletions

...stems/VP1GuideLineSystems/src/guidelinescontrollerform.ui
graphics/VP1/VP1Systems/VP1GuideLineSystems/src/guides_settings_lines_form.ui 192 additions, 0 deletions

...ems/VP1GuideLineSystems/src/guides_settings_lines_form.ui

with 548 additions and 62 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