Merge branch 'master' into 24350_ProjectSaveInstrumentView
Showing
- CMakeLists.txt 6 additions, 3 deletionsCMakeLists.txt
- Framework/API/inc/MantidAPI/Algorithm.h 6 additions, 4 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/AnalysisDataServiceObserver.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/AnalysisDataServiceObserver.h
- Framework/API/inc/MantidAPI/IEventList.h 2 additions, 0 deletionsFramework/API/inc/MantidAPI/IEventList.h
- Framework/API/inc/MantidAPI/IFunction.h 3 additions, 3 deletionsFramework/API/inc/MantidAPI/IFunction.h
- Framework/API/inc/MantidAPI/Sample.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/Sample.h
- Framework/API/src/Algorithm.cpp 10 additions, 11 deletionsFramework/API/src/Algorithm.cpp
- Framework/API/src/AnalysisDataServiceObserver.cpp 57 additions, 95 deletionsFramework/API/src/AnalysisDataServiceObserver.cpp
- Framework/API/src/IFunction.cpp 3 additions, 9 deletionsFramework/API/src/IFunction.cpp
- Framework/API/src/Sample.cpp 12 additions, 18 deletionsFramework/API/src/Sample.cpp
- Framework/API/src/WorkspaceFactory.cpp 18 additions, 12 deletionsFramework/API/src/WorkspaceFactory.cpp
- Framework/API/test/FakeAlgorithms.h 3 additions, 5 deletionsFramework/API/test/FakeAlgorithms.h
- Framework/API/test/SampleTest.h 3 additions, 4 deletionsFramework/API/test/SampleTest.h
- Framework/Algorithms/CMakeLists.txt 1 addition, 0 deletionsFramework/Algorithms/CMakeLists.txt
- Framework/Algorithms/inc/MantidAlgorithms/AlignDetectors.h 0 additions, 4 deletionsFramework/Algorithms/inc/MantidAlgorithms/AlignDetectors.h
- Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h 23 additions, 34 deletionsFramework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
- Framework/Algorithms/inc/MantidAlgorithms/CommutativeBinaryOperation.h 3 additions, 6 deletions...orithms/inc/MantidAlgorithms/CommutativeBinaryOperation.h
- Framework/Algorithms/inc/MantidAlgorithms/CreateSampleWorkspace.h 1 addition, 2 deletions...k/Algorithms/inc/MantidAlgorithms/CreateSampleWorkspace.h
- Framework/Algorithms/inc/MantidAlgorithms/Divide.h 13 additions, 16 deletionsFramework/Algorithms/inc/MantidAlgorithms/Divide.h
- Framework/Algorithms/inc/MantidAlgorithms/He3TubeEfficiency.h 2 additions, 3 deletions...ework/Algorithms/inc/MantidAlgorithms/He3TubeEfficiency.h
Loading
Please register or sign in to comment