Merge remote-tracking branch 'origin/master' into read_only_instrument_directory
Showing
- .githooks/commit-msg 4 additions, 0 deletions.githooks/commit-msg
- Framework/API/src/Algorithm.cpp 38 additions, 82 deletionsFramework/API/src/Algorithm.cpp
- Framework/API/src/FrameworkManager.cpp 4 additions, 1 deletionFramework/API/src/FrameworkManager.cpp
- Framework/API/test/AlgorithmPropertyTest.h 1 addition, 1 deletionFramework/API/test/AlgorithmPropertyTest.h
- Framework/API/test/AlgorithmTest.h 21 additions, 19 deletionsFramework/API/test/AlgorithmTest.h
- Framework/Algorithms/inc/MantidAlgorithms/AddPeak.h 1 addition, 3 deletionsFramework/Algorithms/inc/MantidAlgorithms/AddPeak.h
- Framework/Algorithms/inc/MantidAlgorithms/ApplyDetailedBalance.h 3 additions, 1 deletion...rk/Algorithms/inc/MantidAlgorithms/ApplyDetailedBalance.h
- Framework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h 1 addition, 1 deletionFramework/Algorithms/inc/MantidAlgorithms/CalculateZscore.h
- Framework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h 1 addition, 1 deletionFramework/Algorithms/inc/MantidAlgorithms/ChangeTimeZero.h
- Framework/Algorithms/inc/MantidAlgorithms/CopyDetectorMapping.h 1 addition, 1 deletion...ork/Algorithms/inc/MantidAlgorithms/CopyDetectorMapping.h
- Framework/Algorithms/inc/MantidAlgorithms/CopySample.h 1 addition, 1 deletionFramework/Algorithms/inc/MantidAlgorithms/CopySample.h
- Framework/Algorithms/inc/MantidAlgorithms/CorelliCrossCorrelate.h 3 additions, 1 deletion...k/Algorithms/inc/MantidAlgorithms/CorelliCrossCorrelate.h
- Framework/Algorithms/inc/MantidAlgorithms/CorrectFlightPaths.h 1 addition, 1 deletion...work/Algorithms/inc/MantidAlgorithms/CorrectFlightPaths.h
- Framework/Algorithms/inc/MantidAlgorithms/CorrectKiKf.h 1 addition, 1 deletionFramework/Algorithms/inc/MantidAlgorithms/CorrectKiKf.h
- Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h 3 additions, 1 deletion...rk/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h
- Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h 3 additions, 1 deletion...work/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h
- Framework/Algorithms/inc/MantidAlgorithms/CreateLogPropertyTable.h 1 addition, 3 deletions.../Algorithms/inc/MantidAlgorithms/CreateLogPropertyTable.h
- Framework/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h 1 addition, 1 deletion...rk/Algorithms/inc/MantidAlgorithms/CreatePeaksWorkspace.h
- Framework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h 1 addition, 1 deletionFramework/Algorithms/inc/MantidAlgorithms/CrossCorrelate.h
- Framework/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCor.h 1 addition, 1 deletion...k/Algorithms/inc/MantidAlgorithms/DetectorEfficiencyCor.h
Loading
Please register or sign in to comment