Merge branch 'master' into 19246_workspace_and_algorithm_MPI_support
Showing
- .github/PULL_REQUEST_TEMPLATE.md 8 additions, 9 deletions.github/PULL_REQUEST_TEMPLATE.md
- .gitignore 3 additions, 0 deletions.gitignore
- CMakeLists.txt 2 additions, 1 deletionCMakeLists.txt
- Framework/API/inc/MantidAPI/DomainCreatorFactory.h 7 additions, 2 deletionsFramework/API/inc/MantidAPI/DomainCreatorFactory.h
- Framework/API/inc/MantidAPI/FunctionDomain1D.h 8 additions, 2 deletionsFramework/API/inc/MantidAPI/FunctionDomain1D.h
- Framework/API/inc/MantidAPI/LogManager.h 3 additions, 0 deletionsFramework/API/inc/MantidAPI/LogManager.h
- Framework/API/inc/MantidAPI/ModeratorModel.h 0 additions, 1 deletionFramework/API/inc/MantidAPI/ModeratorModel.h
- Framework/API/inc/MantidAPI/MultipleFileProperty.h 9 additions, 1 deletionFramework/API/inc/MantidAPI/MultipleFileProperty.h
- Framework/API/inc/MantidAPI/ScopedWorkspace.h 6 additions, 3 deletionsFramework/API/inc/MantidAPI/ScopedWorkspace.h
- Framework/API/inc/MantidAPI/TransformScaleFactory.h 0 additions, 1 deletionFramework/API/inc/MantidAPI/TransformScaleFactory.h
- Framework/API/inc/MantidAPI/WorkspaceFactory.h 5 additions, 0 deletionsFramework/API/inc/MantidAPI/WorkspaceFactory.h
- Framework/API/src/FileFinder.cpp 8 additions, 0 deletionsFramework/API/src/FileFinder.cpp
- Framework/API/src/LogManager.cpp 21 additions, 6 deletionsFramework/API/src/LogManager.cpp
- Framework/API/src/MultipleFileProperty.cpp 69 additions, 40 deletionsFramework/API/src/MultipleFileProperty.cpp
- Framework/API/src/Run.cpp 4 additions, 1 deletionFramework/API/src/Run.cpp
- Framework/API/src/WorkspaceFactory.cpp 26 additions, 11 deletionsFramework/API/src/WorkspaceFactory.cpp
- Framework/API/test/AsynchronousTest.h 105 additions, 67 deletionsFramework/API/test/AsynchronousTest.h
- Framework/API/test/MultipleFilePropertyTest.h 5 additions, 0 deletionsFramework/API/test/MultipleFilePropertyTest.h
- Framework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h 2 additions, 2 deletionsFramework/Algorithms/inc/MantidAlgorithms/BinaryOperation.h
- Framework/Algorithms/inc/MantidAlgorithms/CalculateFlatBackground.h 2 additions, 2 deletions...Algorithms/inc/MantidAlgorithms/CalculateFlatBackground.h
Loading
Please register or sign in to comment