Merge remote-tracking branch 'origin/master' into diffraction_multislice_view
Showing
- Framework/API/CMakeLists.txt 3 additions, 0 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/DetectorInfo.h 5 additions, 0 deletionsFramework/API/inc/MantidAPI/DetectorInfo.h
- Framework/API/inc/MantidAPI/FunctionDomain1D.h 11 additions, 3 deletionsFramework/API/inc/MantidAPI/FunctionDomain1D.h
- Framework/API/inc/MantidAPI/FunctionValues.h 6 additions, 5 deletionsFramework/API/inc/MantidAPI/FunctionValues.h
- Framework/API/inc/MantidAPI/IFunction1D.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/IFunction1D.h
- Framework/API/inc/MantidAPI/IPeakFunction.h 15 additions, 4 deletionsFramework/API/inc/MantidAPI/IPeakFunction.h
- Framework/API/inc/MantidAPI/MatrixWorkspace.h 0 additions, 3 deletionsFramework/API/inc/MantidAPI/MatrixWorkspace.h
- Framework/API/inc/MantidAPI/NearestNeighbourInfo.h 11 additions, 2 deletionsFramework/API/inc/MantidAPI/NearestNeighbourInfo.h
- Framework/API/inc/MantidAPI/NearestNeighbours.h 16 additions, 33 deletionsFramework/API/inc/MantidAPI/NearestNeighbours.h
- Framework/API/inc/MantidAPI/PrecompiledHeader.h 0 additions, 1 deletionFramework/API/inc/MantidAPI/PrecompiledHeader.h
- Framework/API/inc/MantidAPI/SpectrumInfo.h 2 additions, 0 deletionsFramework/API/inc/MantidAPI/SpectrumInfo.h
- Framework/API/src/ADSValidator.cpp 1 addition, 0 deletionsFramework/API/src/ADSValidator.cpp
- Framework/API/src/AnalysisDataService.cpp 1 addition, 0 deletionsFramework/API/src/AnalysisDataService.cpp
- Framework/API/src/DataProcessorAlgorithm.cpp 3 additions, 1 deletionFramework/API/src/DataProcessorAlgorithm.cpp
- Framework/API/src/DetectorInfo.cpp 15 additions, 0 deletionsFramework/API/src/DetectorInfo.cpp
- Framework/API/src/FileFinder.cpp 1 addition, 2 deletionsFramework/API/src/FileFinder.cpp
- Framework/API/src/FunctionDomain1D.cpp 15 additions, 0 deletionsFramework/API/src/FunctionDomain1D.cpp
- Framework/API/src/IFunction.cpp 1 addition, 0 deletionsFramework/API/src/IFunction.cpp
- Framework/API/src/IPeakFunction.cpp 62 additions, 23 deletionsFramework/API/src/IPeakFunction.cpp
- Framework/API/src/ImplicitFunctionParserFactory.cpp 1 addition, 1 deletionFramework/API/src/ImplicitFunctionParserFactory.cpp
Loading
Please register or sign in to comment