Merge remote-tracking branch 'origin/master' into add_requests_library
Conflicts: CMakeLists.txt MantidPlot/make_package.rb.in
No related branches found
No related tags found
Showing
- CMakeLists.txt 120 additions, 82 deletionsCMakeLists.txt
- Framework/API/CMakeLists.txt 3 additions, 2 deletionsFramework/API/CMakeLists.txt
- Framework/API/inc/MantidAPI/ADSValidator.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/ADSValidator.h
- Framework/API/inc/MantidAPI/Algorithm.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/Algorithm.h
- Framework/API/inc/MantidAPI/Algorithm.tcc 6 additions, 0 deletionsFramework/API/inc/MantidAPI/Algorithm.tcc
- Framework/API/inc/MantidAPI/AlgorithmFactory.h 6 additions, 20 deletionsFramework/API/inc/MantidAPI/AlgorithmFactory.h
- Framework/API/inc/MantidAPI/AlgorithmHasProperty.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/AlgorithmHasProperty.h
- Framework/API/inc/MantidAPI/AlgorithmHistory.h 14 additions, 38 deletionsFramework/API/inc/MantidAPI/AlgorithmHistory.h
- Framework/API/inc/MantidAPI/AlgorithmManager.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/AlgorithmManager.h
- Framework/API/inc/MantidAPI/AlgorithmObserver.h 6 additions, 18 deletionsFramework/API/inc/MantidAPI/AlgorithmObserver.h
- Framework/API/inc/MantidAPI/AlgorithmProperty.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/AlgorithmProperty.h
- Framework/API/inc/MantidAPI/AlgorithmProxy.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/AlgorithmProxy.h
- Framework/API/inc/MantidAPI/AnalysisDataService.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/AnalysisDataService.h
- Framework/API/inc/MantidAPI/ArchiveSearchFactory.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/ArchiveSearchFactory.h
- Framework/API/inc/MantidAPI/Axis.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/Axis.h
- Framework/API/inc/MantidAPI/BinEdgeAxis.h 6 additions, 21 deletionsFramework/API/inc/MantidAPI/BinEdgeAxis.h
- Framework/API/inc/MantidAPI/BoxController.h 6 additions, 0 deletionsFramework/API/inc/MantidAPI/BoxController.h
- Framework/API/inc/MantidAPI/CatalogFactory.h 6 additions, 20 deletionsFramework/API/inc/MantidAPI/CatalogFactory.h
- Framework/API/inc/MantidAPI/CatalogManager.h 6 additions, 20 deletionsFramework/API/inc/MantidAPI/CatalogManager.h
- Framework/API/inc/MantidAPI/CatalogSession.h 6 additions, 20 deletionsFramework/API/inc/MantidAPI/CatalogSession.h
Loading
Please register or sign in to comment