Merge remote-tracking branch 'origin/master' re #12828
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge done to enable documentation be be fixed, because of removal of
alias directive and addition of related algorithms directive.
Signed-off-by:
Karl Palmen <karl.palmen@stfc.ac.uk>
Showing
- Framework/API/inc/MantidAPI/Algorithm.h 3 additions, 0 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/AlgorithmProxy.h 7 additions, 4 deletionsFramework/API/inc/MantidAPI/AlgorithmProxy.h
- Framework/API/inc/MantidAPI/CompositeDomainMD.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/CompositeDomainMD.h
- Framework/API/inc/MantidAPI/FunctionDomainMD.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/FunctionDomainMD.h
- Framework/API/inc/MantidAPI/FunctionProperty.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/FunctionProperty.h
- Framework/API/inc/MantidAPI/IAlgorithm.h 3 additions, 0 deletionsFramework/API/inc/MantidAPI/IAlgorithm.h
- Framework/API/inc/MantidAPI/IMDIterator.h 17 additions, 9 deletionsFramework/API/inc/MantidAPI/IMDIterator.h
- Framework/API/inc/MantidAPI/IMDNode.h 6 additions, 4 deletionsFramework/API/inc/MantidAPI/IMDNode.h
- Framework/API/inc/MantidAPI/IMDWorkspace.h 3 additions, 16 deletionsFramework/API/inc/MantidAPI/IMDWorkspace.h
- Framework/API/inc/MantidAPI/IndexProperty.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/IndexProperty.h
- Framework/API/inc/MantidAPI/IndexTypeProperty.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/IndexTypeProperty.h
- Framework/API/inc/MantidAPI/MatrixWorkspace.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/MatrixWorkspace.h
- Framework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h 5 additions, 3 deletionsFramework/API/inc/MantidAPI/MatrixWorkspaceMDIterator.h
- Framework/API/inc/MantidAPI/WorkspaceProperty.h 1 addition, 2 deletionsFramework/API/inc/MantidAPI/WorkspaceProperty.h
- Framework/API/inc/MantidAPI/WorkspaceProperty.tcc 3 additions, 2 deletionsFramework/API/inc/MantidAPI/WorkspaceProperty.tcc
- Framework/API/src/AlgorithmProxy.cpp 4 additions, 3 deletionsFramework/API/src/AlgorithmProxy.cpp
- Framework/API/src/EqualBinSizesValidator.cpp 2 additions, 2 deletionsFramework/API/src/EqualBinSizesValidator.cpp
- Framework/API/src/FunctionDomainMD.cpp 3 additions, 3 deletionsFramework/API/src/FunctionDomainMD.cpp
- Framework/API/src/FunctionProperty.cpp 3 additions, 3 deletionsFramework/API/src/FunctionProperty.cpp
- Framework/API/src/IMDWorkspace.cpp 4 additions, 3 deletionsFramework/API/src/IMDWorkspace.cpp
Loading
Please register or sign in to comment