Refs #11053 Resolve rebase conflict (d165ed47) · Commits · mantidproject / mantid · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

d165ed47

Commit d165ed47 authored 10 years ago by Anton Piccardo-Selg

Downloads
- Patches
- Plain Diff

Refs #11053 Resolve rebase conflict

parent a6a5947b

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt 2 additions, 0 deletions

Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/CMakeLists.txt
Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/CameraManager.h 60 additions, 0 deletions

...dgets/inc/MantidVatesSimpleGuiViewWidgets/CameraManager.h
Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/CameraManager.cpp 89 additions, 0 deletions

...id/Vates/VatesSimpleGui/ViewWidgets/src/CameraManager.cpp

with 151 additions and 0 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