Re #14896 Merge in master and resolve conflicts
No related branches found
No related tags found
Showing
- Framework/API/CMakeLists.txt 3 additions, 0 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/Algorithm.h 50 additions, 52 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/AlgorithmFactory.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/AlgorithmFactory.h
- Framework/API/inc/MantidAPI/AlgorithmHasProperty.h 4 additions, 4 deletionsFramework/API/inc/MantidAPI/AlgorithmHasProperty.h
- Framework/API/inc/MantidAPI/AlgorithmProperty.h 6 additions, 6 deletionsFramework/API/inc/MantidAPI/AlgorithmProperty.h
- Framework/API/inc/MantidAPI/AlgorithmProxy.h 46 additions, 41 deletionsFramework/API/inc/MantidAPI/AlgorithmProxy.h
- Framework/API/inc/MantidAPI/AnalysisDataService.h 7 additions, 6 deletionsFramework/API/inc/MantidAPI/AnalysisDataService.h
- Framework/API/inc/MantidAPI/ArchiveSearchFactory.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/ArchiveSearchFactory.h
- Framework/API/inc/MantidAPI/Axis.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/Axis.h
- Framework/API/inc/MantidAPI/BinEdgeAxis.h 7 additions, 7 deletionsFramework/API/inc/MantidAPI/BinEdgeAxis.h
- Framework/API/inc/MantidAPI/CatalogFactory.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/CatalogFactory.h
- Framework/API/inc/MantidAPI/ColumnFactory.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/ColumnFactory.h
- Framework/API/inc/MantidAPI/CommonBinsValidator.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/CommonBinsValidator.h
- Framework/API/inc/MantidAPI/CompositeCatalog.h 18 additions, 18 deletionsFramework/API/inc/MantidAPI/CompositeCatalog.h
- Framework/API/inc/MantidAPI/CompositeDomainMD.h 4 additions, 4 deletionsFramework/API/inc/MantidAPI/CompositeDomainMD.h
- Framework/API/inc/MantidAPI/CompositeFunction.h 48 additions, 45 deletionsFramework/API/inc/MantidAPI/CompositeFunction.h
- Framework/API/inc/MantidAPI/ConstraintFactory.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/ConstraintFactory.h
- Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h 5 additions, 5 deletionsFramework/API/inc/MantidAPI/DataProcessorAlgorithm.h
- Framework/API/inc/MantidAPI/DomainCreatorFactory.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/DomainCreatorFactory.h
- Framework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h 4 additions, 4 deletionsFramework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h
Loading
Please register or sign in to comment