Merge branch 'master' of https://github.com/mantidproject/mantid into...
Merge branch 'master' of https://github.com/mantidproject/mantid into 28424_wb_brash_close_plot_then_define_new_fit_fn # Conflicts: # qt/widgets/common/src/FitPropertyBrowser.cpp
No related branches found
No related tags found
Showing
- Framework/API/CMakeLists.txt 0 additions, 3 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/Algorithm.h 0 additions, 4 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/AlgorithmManager.h 1 addition, 2 deletionsFramework/API/inc/MantidAPI/AlgorithmManager.h
- Framework/API/inc/MantidAPI/AlgorithmProxy.h 0 additions, 207 deletionsFramework/API/inc/MantidAPI/AlgorithmProxy.h
- Framework/API/inc/MantidAPI/FrameworkManager.h 0 additions, 13 deletionsFramework/API/inc/MantidAPI/FrameworkManager.h
- Framework/API/inc/MantidAPI/IAlgorithm.h 1 addition, 2 deletionsFramework/API/inc/MantidAPI/IAlgorithm.h
- Framework/API/src/Algorithm.cpp 0 additions, 16 deletionsFramework/API/src/Algorithm.cpp
- Framework/API/src/AlgorithmManager.cpp 4 additions, 14 deletionsFramework/API/src/AlgorithmManager.cpp
- Framework/API/src/AlgorithmObserver.cpp 4 additions, 28 deletionsFramework/API/src/AlgorithmObserver.cpp
- Framework/API/src/AlgorithmProxy.cpp 0 additions, 363 deletionsFramework/API/src/AlgorithmProxy.cpp
- Framework/API/src/FrameworkManager.cpp 4 additions, 73 deletionsFramework/API/src/FrameworkManager.cpp
- Framework/API/test/AlgorithmManagerTest.h 8 additions, 27 deletionsFramework/API/test/AlgorithmManagerTest.h
- Framework/API/test/AlgorithmProxyTest.h 0 additions, 264 deletionsFramework/API/test/AlgorithmProxyTest.h
- Framework/API/test/FrameworkManagerTest.h 0 additions, 55 deletionsFramework/API/test/FrameworkManagerTest.h
- Framework/Algorithms/src/RenameWorkspace.cpp 3 additions, 2 deletionsFramework/Algorithms/src/RenameWorkspace.cpp
- Framework/Algorithms/test/AnyShapeAbsorptionTest.h 3 additions, 3 deletionsFramework/Algorithms/test/AnyShapeAbsorptionTest.h
- Framework/Algorithms/test/AppendSpectraTest.h 5 additions, 7 deletionsFramework/Algorithms/test/AppendSpectraTest.h
- Framework/Algorithms/test/CalculateCarpenterSampleCorrectionTest.h 5 additions, 8 deletions.../Algorithms/test/CalculateCarpenterSampleCorrectionTest.h
- Framework/Algorithms/test/CarpenterSampleCorrectionTest.h 2 additions, 3 deletionsFramework/Algorithms/test/CarpenterSampleCorrectionTest.h
- Framework/Algorithms/test/ConvertUnitsTest.h 29 additions, 19 deletionsFramework/Algorithms/test/ConvertUnitsTest.h
Loading
Please register or sign in to comment