Merge branch 'master' into LeBailFit_concepts (4b7f95e6) · 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

4b7f95e6

Unverified Commit 4b7f95e6 authored 6 years ago by Martyn Gigg Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into LeBailFit_concepts

parents b956d62b d73e9724

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Framework/Geometry/src/Instrument.cpp 9 additions, 8 deletions

Framework/Geometry/src/Instrument.cpp
Framework/Geometry/test/InstrumentTest.h 8 additions, 0 deletions

Framework/Geometry/test/InstrumentTest.h
Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py 3 additions, 4 deletions

...ithms/WorkflowAlgorithms/SANS/SANSBeamCentreFinderCore.py
docs/source/release/v3.14.0/framework.rst 1 addition, 2 deletions

docs/source/release/v3.14.0/framework.rst
docs/source/release/v3.14.0/sans.rst 1 addition, 0 deletions

docs/source/release/v3.14.0/sans.rst
scripts/SANS/sans/state/mask.py 3 additions, 0 deletions

scripts/SANS/sans/state/mask.py
scripts/test/SANS/gui_logic/masking_table_presenter_test.py 2 additions, 1 deletion

scripts/test/SANS/gui_logic/masking_table_presenter_test.py

with 27 additions and 15 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