Merge branch 'master' into 28310_cancel_script_during_alg_in_workbench
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- CMakeLists.txt 4 additions, 0 deletionsCMakeLists.txt
- Framework/API/inc/MantidAPI/Algorithm.h 12 additions, 6 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/AlgorithmHistory.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/AlgorithmHistory.h
- Framework/API/inc/MantidAPI/AlgorithmManager.h 5 additions, 4 deletionsFramework/API/inc/MantidAPI/AlgorithmManager.h
- Framework/API/inc/MantidAPI/AlgorithmObserver.h 7 additions, 7 deletionsFramework/API/inc/MantidAPI/AlgorithmObserver.h
- Framework/API/inc/MantidAPI/AlgorithmProxy.h 13 additions, 5 deletionsFramework/API/inc/MantidAPI/AlgorithmProxy.h
- Framework/API/inc/MantidAPI/BoostOptionalToAlgorithmProperty.h 12 additions, 8 deletions...work/API/inc/MantidAPI/BoostOptionalToAlgorithmProperty.h
- Framework/API/inc/MantidAPI/BoxController.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/BoxController.h
- Framework/API/inc/MantidAPI/CompositeCatalog.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/CompositeCatalog.h
- Framework/API/inc/MantidAPI/CompositeDomainMD.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/CompositeDomainMD.h
- Framework/API/inc/MantidAPI/CompositeFunction.h 3 additions, 2 deletionsFramework/API/inc/MantidAPI/CompositeFunction.h
- Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/DataProcessorAlgorithm.h
- Framework/API/inc/MantidAPI/DetectorSearcher.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/DetectorSearcher.h
- Framework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h 3 additions, 1 deletionFramework/API/inc/MantidAPI/EnabledWhenWorkspaceIsType.h
- Framework/API/inc/MantidAPI/ExperimentInfo.h 3 additions, 3 deletionsFramework/API/inc/MantidAPI/ExperimentInfo.h
- Framework/API/inc/MantidAPI/FileLoaderRegistry.h 2 additions, 0 deletionsFramework/API/inc/MantidAPI/FileLoaderRegistry.h
- Framework/API/inc/MantidAPI/FunctionDomainGeneral.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/FunctionDomainGeneral.h
- Framework/API/inc/MantidAPI/FunctionDomainMD.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/FunctionDomainMD.h
Loading
Please register or sign in to comment