Merge branch 'master' of github.com:mantidproject/mantid into feature/13347_Curvefitting_reorg
Conflicts: Framework/CurveFitting/src/MultiBG.cpp re #13347
No related branches found
No related tags found
Showing
- Framework/API/inc/MantidAPI/ITransformScale.h 1 addition, 0 deletionsFramework/API/inc/MantidAPI/ITransformScale.h
- Framework/API/src/AlgorithmFactory.cpp 0 additions, 1 deletionFramework/API/src/AlgorithmFactory.cpp
- Framework/API/src/Axis.cpp 0 additions, 2 deletionsFramework/API/src/Axis.cpp
- Framework/API/src/Column.cpp 3 additions, 2 deletionsFramework/API/src/Column.cpp
- Framework/API/src/ColumnFactory.cpp 0 additions, 1 deletionFramework/API/src/ColumnFactory.cpp
- Framework/API/src/CompositeFunction.cpp 0 additions, 1 deletionFramework/API/src/CompositeFunction.cpp
- Framework/API/src/CostFunctionFactory.cpp 0 additions, 1 deletionFramework/API/src/CostFunctionFactory.cpp
- Framework/API/src/Expression.cpp 4 additions, 4 deletionsFramework/API/src/Expression.cpp
- Framework/API/src/FileProperty.cpp 0 additions, 1 deletionFramework/API/src/FileProperty.cpp
- Framework/API/src/FunctionDomain1D.cpp 0 additions, 1 deletionFramework/API/src/FunctionDomain1D.cpp
- Framework/API/src/FunctionValues.cpp 0 additions, 1 deletionFramework/API/src/FunctionValues.cpp
- Framework/API/src/GridDomain.cpp 0 additions, 1 deletionFramework/API/src/GridDomain.cpp
- Framework/API/src/GridDomain1D.cpp 0 additions, 1 deletionFramework/API/src/GridDomain1D.cpp
- Framework/API/src/IFunction.cpp 0 additions, 1 deletionFramework/API/src/IFunction.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/IFunctionMW.cpp 0 additions, 2 deletionsFramework/API/src/IFunctionMW.cpp
- Framework/API/src/LinearScale.cpp 0 additions, 1 deletionFramework/API/src/LinearScale.cpp
- Framework/API/src/LogarithmScale.cpp 0 additions, 1 deletionFramework/API/src/LogarithmScale.cpp
- Framework/API/src/ParamFunction.cpp 0 additions, 1 deletionFramework/API/src/ParamFunction.cpp
Loading
Please register or sign in to comment