Re #17673 Resolving conflicts with master
No related branches found
No related tags found
Showing
- .flake8 28 additions, 0 deletions.flake8
- Framework/API/CMakeLists.txt 0 additions, 2 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/CompositeFunction.h 6 additions, 0 deletionsFramework/API/inc/MantidAPI/CompositeFunction.h
- Framework/API/inc/MantidAPI/ISpectrum.h 2 additions, 12 deletionsFramework/API/inc/MantidAPI/ISpectrum.h
- Framework/API/inc/MantidAPI/Jacobian.h 4 additions, 0 deletionsFramework/API/inc/MantidAPI/Jacobian.h
- Framework/API/inc/MantidAPI/MatrixWorkspace.h 0 additions, 16 deletionsFramework/API/inc/MantidAPI/MatrixWorkspace.h
- Framework/API/inc/MantidAPI/MultiPeriodGroupWorker.h 3 additions, 3 deletionsFramework/API/inc/MantidAPI/MultiPeriodGroupWorker.h
- Framework/API/inc/MantidAPI/MultipleFileProperty.h 10 additions, 4 deletionsFramework/API/inc/MantidAPI/MultipleFileProperty.h
- Framework/API/src/FrameworkManager.cpp 2 additions, 2 deletionsFramework/API/src/FrameworkManager.cpp
- Framework/API/src/IPeakFunction.cpp 7 additions, 0 deletionsFramework/API/src/IPeakFunction.cpp
- Framework/API/src/MatrixWSIndexCalculator.cpp 0 additions, 40 deletionsFramework/API/src/MatrixWSIndexCalculator.cpp
- Framework/API/src/MatrixWorkspace.cpp 5 additions, 7 deletionsFramework/API/src/MatrixWorkspace.cpp
- Framework/API/src/MultiDomainFunction.cpp 1 addition, 0 deletionsFramework/API/src/MultiDomainFunction.cpp
- Framework/API/src/MultiPeriodGroupWorker.cpp 19 additions, 5 deletionsFramework/API/src/MultiPeriodGroupWorker.cpp
- Framework/API/src/MultipleFileProperty.cpp 49 additions, 7 deletionsFramework/API/src/MultipleFileProperty.cpp
- Framework/API/src/NumericAxis.cpp 3 additions, 3 deletionsFramework/API/src/NumericAxis.cpp
- Framework/API/src/Run.cpp 1 addition, 1 deletionFramework/API/src/Run.cpp
- Framework/API/src/SpectrumInfo.cpp 2 additions, 2 deletionsFramework/API/src/SpectrumInfo.cpp
- Framework/API/src/WorkspaceOpOverloads.cpp 2 additions, 3 deletionsFramework/API/src/WorkspaceOpOverloads.cpp
- Framework/API/test/IFunction1DTest.h 1 addition, 0 deletionsFramework/API/test/IFunction1DTest.h
Loading
Please register or sign in to comment