Refs #7711 Merge Master into branch to resolve conflict.
Showing
- Code/Mantid/Build/CMake/CPackCommon.cmake 0 additions, 1 deletionCode/Mantid/Build/CMake/CPackCommon.cmake
- Code/Mantid/Build/CMake/CommonSetup.cmake 12 additions, 14 deletionsCode/Mantid/Build/CMake/CommonSetup.cmake
- Code/Mantid/Build/CMake/VersionNumber.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/VersionNumber.cmake
- Code/Mantid/Framework/API/src/ExperimentInfo.cpp 2 additions, 0 deletionsCode/Mantid/Framework/API/src/ExperimentInfo.cpp
- Code/Mantid/Framework/API/test/ExperimentInfoTest.h 7 additions, 5 deletionsCode/Mantid/Framework/API/test/ExperimentInfoTest.h
- Code/Mantid/Framework/Algorithms/CMakeLists.txt 0 additions, 3 deletionsCode/Mantid/Framework/Algorithms/CMakeLists.txt
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h 6 additions, 7 deletions...rk/Algorithms/inc/MantidAlgorithms/CheckWorkspacesMatch.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h 3 additions, 4 deletions...id/Framework/Algorithms/inc/MantidAlgorithms/CopySample.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/FlatBackground.h 0 additions, 90 deletions...ramework/Algorithms/inc/MantidAlgorithms/FlatBackground.h
- Code/Mantid/Framework/Algorithms/src/CheckWorkspacesMatch.cpp 297 additions, 219 deletions.../Mantid/Framework/Algorithms/src/CheckWorkspacesMatch.cpp
- Code/Mantid/Framework/Algorithms/src/CopySample.cpp 34 additions, 6 deletionsCode/Mantid/Framework/Algorithms/src/CopySample.cpp
- Code/Mantid/Framework/Algorithms/src/FlatBackground.cpp 0 additions, 382 deletionsCode/Mantid/Framework/Algorithms/src/FlatBackground.cpp
- Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h 150 additions, 3 deletions...ntid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h
- Code/Mantid/Framework/Algorithms/test/CopySampleTest.h 63 additions, 0 deletionsCode/Mantid/Framework/Algorithms/test/CopySampleTest.h
- Code/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h 0 additions, 264 deletionsCode/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h
- Code/Mantid/Framework/Crystal/src/SaveHKL.cpp 10 additions, 0 deletionsCode/Mantid/Framework/Crystal/src/SaveHKL.cpp
- Code/Mantid/Framework/DataHandling/CMakeLists.txt 3 additions, 0 deletionsCode/Mantid/Framework/DataHandling/CMakeLists.txt
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/ConvertFullprofToXML.h 89 additions, 0 deletions...ataHandling/inc/MantidDataHandling/ConvertFullprofToXML.h
- Code/Mantid/Framework/DataHandling/src/ConvertFullprofToXML.cpp 319 additions, 0 deletions...antid/Framework/DataHandling/src/ConvertFullprofToXML.cpp
- Code/Mantid/Framework/DataHandling/src/LoadFullprofResolution.cpp 17 additions, 4 deletions...tid/Framework/DataHandling/src/LoadFullprofResolution.cpp
Loading
Please register or sign in to comment