Merge branch 'master' into 24529_separate_default_gui_properties
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- CMakeLists.txt 65 additions, 24 deletionsCMakeLists.txt
- Framework/API/CMakeLists.txt 2 additions, 0 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/Sample.h 1 addition, 0 deletionsFramework/API/inc/MantidAPI/Sample.h
- Framework/API/src/IFuncMinimizer.cpp 0 additions, 2 deletionsFramework/API/src/IFuncMinimizer.cpp
- Framework/API/src/IFunction1D.cpp 0 additions, 1 deletionFramework/API/src/IFunction1D.cpp
- Framework/API/src/IFunctionMD.cpp 0 additions, 1 deletionFramework/API/src/IFunctionMD.cpp
- Framework/API/src/IPeakFunction.cpp 0 additions, 1 deletionFramework/API/src/IPeakFunction.cpp
- Framework/API/src/ModeratorModel.cpp 0 additions, 2 deletionsFramework/API/src/ModeratorModel.cpp
- Framework/API/src/Sample.cpp 2 additions, 0 deletionsFramework/API/src/Sample.cpp
- Framework/API/src/SpectraAxis.cpp 0 additions, 2 deletionsFramework/API/src/SpectraAxis.cpp
- Framework/API/src/Workspace.cpp 0 additions, 2 deletionsFramework/API/src/Workspace.cpp
- Framework/Algorithms/CMakeLists.txt 1 addition, 0 deletionsFramework/Algorithms/CMakeLists.txt
- Framework/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h 1 addition, 0 deletions...rk/Algorithms/inc/MantidAlgorithms/AbsorptionCorrection.h
- Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h 1 addition, 1 deletion...rk/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
- Framework/Algorithms/src/AbsorptionCorrection.cpp 83 additions, 9 deletionsFramework/Algorithms/src/AbsorptionCorrection.cpp
- Framework/Algorithms/src/AddPeak.cpp 1 addition, 2 deletionsFramework/Algorithms/src/AddPeak.cpp
- Framework/Algorithms/src/AnyShapeAbsorption.cpp 1 addition, 1 deletionFramework/Algorithms/src/AnyShapeAbsorption.cpp
- Framework/Algorithms/src/CalculateFlatBackground.cpp 0 additions, 1 deletionFramework/Algorithms/src/CalculateFlatBackground.cpp
- Framework/Algorithms/src/ConvertUnits.cpp 5 additions, 2 deletionsFramework/Algorithms/src/ConvertUnits.cpp
Loading
Please register or sign in to comment