Merge branch 'master' of github.com:mantidproject/mantid into 21508_OSIRISSetFacilityInUnitTests
# Conflicts: # Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/ElasticWindowMultiple.py Refs #21508
No related branches found
No related tags found
Showing
- .flake8 1 addition, 0 deletions.flake8
- .github/ISSUE_TEMPLATE.md 2 additions, 0 deletions.github/ISSUE_TEMPLATE.md
- .github/PULL_REQUEST_TEMPLATE.md 7 additions, 4 deletions.github/PULL_REQUEST_TEMPLATE.md
- .gitignore 2 additions, 0 deletions.gitignore
- CMakeLists.txt 44 additions, 18 deletionsCMakeLists.txt
- Framework/API/CMakeLists.txt 6 additions, 1 deletionFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/Algorithm.h 5 additions, 3 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/AlgorithmFactory.h 9 additions, 9 deletionsFramework/API/inc/MantidAPI/AlgorithmFactory.h
- Framework/API/inc/MantidAPI/AlgorithmHistory.h 4 additions, 4 deletionsFramework/API/inc/MantidAPI/AlgorithmHistory.h
- Framework/API/inc/MantidAPI/AlgorithmManager.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/AlgorithmManager.h
- Framework/API/inc/MantidAPI/AlgorithmProperty.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/AlgorithmProperty.h
- Framework/API/inc/MantidAPI/AlgorithmProxy.h 8 additions, 5 deletionsFramework/API/inc/MantidAPI/AlgorithmProxy.h
- Framework/API/inc/MantidAPI/AnalysisDataService.h 56 additions, 59 deletionsFramework/API/inc/MantidAPI/AnalysisDataService.h
- Framework/API/inc/MantidAPI/ArchiveSearchFactory.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/ArchiveSearchFactory.h
- Framework/API/inc/MantidAPI/BoxController.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/BoxController.h
- Framework/API/inc/MantidAPI/CatalogFactory.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/CatalogFactory.h
- Framework/API/inc/MantidAPI/CatalogManager.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/CatalogManager.h
- Framework/API/inc/MantidAPI/CatalogSession.h 2 additions, 2 deletionsFramework/API/inc/MantidAPI/CatalogSession.h
- Framework/API/inc/MantidAPI/Column.h 5 additions, 2 deletionsFramework/API/inc/MantidAPI/Column.h
- Framework/API/inc/MantidAPI/ColumnFactory.h 1 addition, 1 deletionFramework/API/inc/MantidAPI/ColumnFactory.h
Loading
Please register or sign in to comment