Merge branch 'master' into WSManipulationDocs
Showing
- .github/PULL_REQUEST_TEMPLATE.md 1 addition, 0 deletions.github/PULL_REQUEST_TEMPLATE.md
- DEPENDENCY_LICENSES.md 68 additions, 0 deletionsDEPENDENCY_LICENSES.md
- Framework/API/inc/MantidAPI/Algorithm.h 8 additions, 0 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/FunctionFactory.h 7 additions, 0 deletionsFramework/API/inc/MantidAPI/FunctionFactory.h
- Framework/API/inc/MantidAPI/IAlgorithm.h 3 additions, 0 deletionsFramework/API/inc/MantidAPI/IAlgorithm.h
- Framework/API/inc/MantidAPI/LogManager.h 3 additions, 1 deletionFramework/API/inc/MantidAPI/LogManager.h
- Framework/API/src/Algorithm.cpp 69 additions, 14 deletionsFramework/API/src/Algorithm.cpp
- Framework/API/src/AlgorithmManager.cpp 5 additions, 5 deletionsFramework/API/src/AlgorithmManager.cpp
- Framework/API/src/FunctionFactory.cpp 31 additions, 0 deletionsFramework/API/src/FunctionFactory.cpp
- Framework/API/src/LogManager.cpp 7 additions, 3 deletionsFramework/API/src/LogManager.cpp
- Framework/API/test/AlgorithmTest.h 47 additions, 0 deletionsFramework/API/test/AlgorithmTest.h
- Framework/API/test/MatrixWorkspaceTest.h 1 addition, 1 deletionFramework/API/test/MatrixWorkspaceTest.h
- Framework/Algorithms/CMakeLists.txt 1 addition, 0 deletionsFramework/Algorithms/CMakeLists.txt
- Framework/Crystal/src/CombinePeaksWorkspaces.cpp 58 additions, 0 deletionsFramework/Crystal/src/CombinePeaksWorkspaces.cpp
- Framework/Crystal/test/CombinePeaksWorkspacesTest.h 159 additions, 0 deletionsFramework/Crystal/test/CombinePeaksWorkspacesTest.h
- Framework/DataHandling/CMakeLists.txt 23 additions, 0 deletionsFramework/DataHandling/CMakeLists.txt
- Framework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h 7 additions, 0 deletionsFramework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h
- Framework/DataHandling/inc/MantidDataHandling/LoadILLTOF2.h 2 additions, 1 deletionFramework/DataHandling/inc/MantidDataHandling/LoadILLTOF2.h
- Framework/DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h 3 additions, 0 deletions.../DataHandling/inc/MantidDataHandling/LoadNexusProcessed.h
- Framework/DataHandling/inc/MantidDataHandling/LoadSampleEnvironment.h 9 additions, 0 deletions...taHandling/inc/MantidDataHandling/LoadSampleEnvironment.h
Loading
Please register or sign in to comment