refs #11393. Fix merge conflicts.
Merge branch 'master' into 11393_smooth_md Conflicts: Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspaceIterator.h Code/Mantid/Framework/DataObjects/src/MDHistoWorkspaceIterator.cpp
No related branches found
No related tags found
Showing
- Code/Mantid/Build/CMake/CommonVatesSetup.cmake 0 additions, 1 deletionCode/Mantid/Build/CMake/CommonVatesSetup.cmake
- Code/Mantid/Build/Jenkins/buildscript 45 additions, 35 deletionsCode/Mantid/Build/Jenkins/buildscript
- Code/Mantid/Build/Jenkins/buildscript.bat 26 additions, 18 deletionsCode/Mantid/Build/Jenkins/buildscript.bat
- Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec 2 additions, 2 deletions...d/dev-packages/rpm/mantid-developer/mantid-developer.spec
- Code/Mantid/Framework/API/inc/MantidAPI/IFuncMinimizer.h 4 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IFuncMinimizer.h
- Code/Mantid/Framework/API/inc/MantidAPI/IMDNode.h 1 addition, 1 deletionCode/Mantid/Framework/API/inc/MantidAPI/IMDNode.h
- Code/Mantid/Framework/Algorithms/CMakeLists.txt 0 additions, 3 deletionsCode/Mantid/Framework/Algorithms/CMakeLists.txt
- Code/Mantid/Framework/Algorithms/src/Stitch1DMany.cpp 4 additions, 4 deletionsCode/Mantid/Framework/Algorithms/src/Stitch1DMany.cpp
- Code/Mantid/Framework/Algorithms/test/CMakeLists.txt 4 additions, 4 deletionsCode/Mantid/Framework/Algorithms/test/CMakeLists.txt
- Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h 4 additions, 5 deletions...ntid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h
- Code/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h 2 additions, 3 deletionsCode/Mantid/Framework/Algorithms/test/CloneWorkspaceTest.h
- Code/Mantid/Framework/Algorithms/test/ConvertEmptyToTofTest.h 5 additions, 0 deletions.../Mantid/Framework/Algorithms/test/ConvertEmptyToTofTest.h
- Code/Mantid/Framework/Algorithms/test/CopySampleTest.h 3 additions, 7 deletionsCode/Mantid/Framework/Algorithms/test/CopySampleTest.h
- Code/Mantid/Framework/Algorithms/test/CreateSampleWorkspaceTest.h 4 additions, 0 deletions...tid/Framework/Algorithms/test/CreateSampleWorkspaceTest.h
- Code/Mantid/Framework/Algorithms/test/ElasticWindowTest.h 9 additions, 1 deletionCode/Mantid/Framework/Algorithms/test/ElasticWindowTest.h
- Code/Mantid/Framework/Algorithms/test/ReflectometryReductionOneTest.h 2 additions, 0 deletions...Framework/Algorithms/test/ReflectometryReductionOneTest.h
- Code/Mantid/Framework/Algorithms/test/RemoveExpDecayTest.h 10 additions, 1 deletionCode/Mantid/Framework/Algorithms/test/RemoveExpDecayTest.h
- Code/Mantid/Framework/Algorithms/test/StripPeaksTest.h 2 additions, 0 deletionsCode/Mantid/Framework/Algorithms/test/StripPeaksTest.h
- Code/Mantid/Framework/Algorithms/test/WienerSmoothTest.h 6 additions, 1 deletionCode/Mantid/Framework/Algorithms/test/WienerSmoothTest.h
- Code/Mantid/Framework/CMakeLists.txt 1 addition, 2 deletionsCode/Mantid/Framework/CMakeLists.txt
Loading
Please register or sign in to comment