Merge branch 'master' of github.com:mantidproject/mantid into 13758_slit_calculator_with_SURF (d7d1530e) · 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

d7d1530e

Commit d7d1530e authored 9 years ago by Matt King

Downloads
- Plain Diff

Merge branch 'master' of github.com:mantidproject/mantid into 13758_slit_calculator_with_SURF

parents f44dfb00 72cfc545

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Framework/Algorithms/test/RemoveExpDecayTest.h 149 additions, 36 deletions

Framework/Algorithms/test/RemoveExpDecayTest.h
Framework/CurveFitting/src/ParameterEstimator.cpp 33 additions, 7 deletions

Framework/CurveFitting/src/ParameterEstimator.cpp
Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h 1 addition, 2 deletions

Framework/Geometry/inc/MantidGeometry/Crystal/HKLGenerator.h
Framework/Geometry/src/Crystal/HKLGenerator.cpp 5 additions, 0 deletions

Framework/Geometry/src/Crystal/HKLGenerator.cpp
MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.h 3 additions, 0 deletions

...nterfaces/inc/MantidQtCustomInterfaces/Indirect/ConvFit.h
MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp 18 additions, 13 deletions

MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
docs/source/algorithms/RemoveExpDecay-v1.rst 3 additions, 2 deletions

docs/source/algorithms/RemoveExpDecay-v1.rst

with 212 additions and 60 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