Merge remote-tracking branch 'origin/master' into properties_as_double
Showing
- Framework/API/src/FrameworkManager.cpp 1 addition, 0 deletionsFramework/API/src/FrameworkManager.cpp
- Framework/API/src/MDFrameValidator.cpp 2 additions, 2 deletionsFramework/API/src/MDFrameValidator.cpp
- Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp 16 additions, 16 deletionsFramework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
- Framework/Algorithms/test/ReflectometryReductionOneAuto2Test.h 12 additions, 12 deletions...work/Algorithms/test/ReflectometryReductionOneAuto2Test.h
- Framework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp 1 addition, 0 deletionsFramework/CurveFitting/src/CostFunctions/CostFuncFitting.cpp
- Framework/DataHandling/inc/MantidDataHandling/LoadSwans.h 1 addition, 2 deletionsFramework/DataHandling/inc/MantidDataHandling/LoadSwans.h
- Framework/DataHandling/src/LoadSwans.cpp 1 addition, 2 deletionsFramework/DataHandling/src/LoadSwans.cpp
- Framework/Kernel/CMakeLists.txt 0 additions, 50 deletionsFramework/Kernel/CMakeLists.txt
- Framework/Kernel/inc/MantidKernel/UsageService.h 2 additions, 2 deletionsFramework/Kernel/inc/MantidKernel/UsageService.h
- Framework/Kernel/src/UsageService.cpp 6 additions, 4 deletionsFramework/Kernel/src/UsageService.cpp
- Framework/Kernel/test/UsageServiceTest.h 4 additions, 4 deletionsFramework/Kernel/test/UsageServiceTest.h
- Framework/Properties/Mantid.properties.template 1 addition, 8 deletionsFramework/Properties/Mantid.properties.template
- Framework/PythonInterface/CMakeLists.txt 1 addition, 0 deletionsFramework/PythonInterface/CMakeLists.txt
- Framework/PythonInterface/mantid/__init__.py 36 additions, 118 deletionsFramework/PythonInterface/mantid/__init__.py
- Framework/PythonInterface/mantid/_plugins/CMakeLists.txt 3 additions, 2 deletionsFramework/PythonInterface/mantid/_plugins/CMakeLists.txt
- Framework/PythonInterface/mantid/_plugins/__init__.py 4 additions, 1 deletionFramework/PythonInterface/mantid/_plugins/__init__.py
- Framework/PythonInterface/mantid/api/__init__.py 3 additions, 14 deletionsFramework/PythonInterface/mantid/api/__init__.py
- Framework/PythonInterface/mantid/api/_aliases.py 23 additions, 13 deletionsFramework/PythonInterface/mantid/api/_aliases.py
- Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp 21 additions, 1 deletion...thonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
- Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp 26 additions, 1 deletion...nInterface/mantid/api/src/Exports/AnalysisDataService.cpp
Loading
Please register or sign in to comment