Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
ba230e5d
Commit
ba230e5d
authored
8 years ago
by
Lynch, Vickie
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/release-v3.6.0' into 15230_integration_radius
parents
1a51a6fa
3787736e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
MantidQt/SliceViewer/inc/MantidQtSliceViewer/ColorBarWidget.ui
+14
-2
14 additions, 2 deletions
...dQt/SliceViewer/inc/MantidQtSliceViewer/ColorBarWidget.ui
MantidQt/SliceViewer/src/SliceViewer.cpp
+33
-4
33 additions, 4 deletions
MantidQt/SliceViewer/src/SliceViewer.cpp
with
47 additions
and
6 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment