attempting to fix merge conflict
Refs #13262
Showing
- Code/Mantid/Build/CMake/DarwinSetup.cmake 1 addition, 5 deletionsCode/Mantid/Build/CMake/DarwinSetup.cmake
- Code/Mantid/Build/class_maker.py 20 additions, 29 deletionsCode/Mantid/Build/class_maker.py
- Code/Mantid/CMakeLists.txt 0 additions, 14 deletionsCode/Mantid/CMakeLists.txt
- Code/Mantid/Framework/API/inc/MantidAPI/IMaskWorkspace.h 7 additions, 1 deletionCode/Mantid/Framework/API/inc/MantidAPI/IMaskWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/ISpectrum.h 7 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/ISpectrum.h
- Code/Mantid/Framework/API/src/ISpectrum.cpp 39 additions, 8 deletionsCode/Mantid/Framework/API/src/ISpectrum.cpp
- Code/Mantid/Framework/API/test/ISpectrumTest.h 52 additions, 0 deletionsCode/Mantid/Framework/API/test/ISpectrumTest.h
- Code/Mantid/Framework/Algorithms/CMakeLists.txt 4 additions, 1 deletionCode/Mantid/Framework/Algorithms/CMakeLists.txt
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ProcessIndirectFitParameters.h 59 additions, 0 deletions...ithms/inc/MantidAlgorithms/ProcessIndirectFitParameters.h
- Code/Mantid/Framework/Algorithms/src/CreateSampleWorkspace.cpp 19 additions, 6 deletions...Mantid/Framework/Algorithms/src/CreateSampleWorkspace.cpp
- Code/Mantid/Framework/Algorithms/src/ExtractSpectra.cpp 26 additions, 2 deletionsCode/Mantid/Framework/Algorithms/src/ExtractSpectra.cpp
- Code/Mantid/Framework/Algorithms/src/ProcessIndirectFitParameters.cpp 263 additions, 0 deletions...Framework/Algorithms/src/ProcessIndirectFitParameters.cpp
- Code/Mantid/Framework/Algorithms/src/TOFSANSResolutionByPixel.cpp 5 additions, 5 deletions...tid/Framework/Algorithms/src/TOFSANSResolutionByPixel.cpp
- Code/Mantid/Framework/Algorithms/test/ExtractSpectraTest.h 76 additions, 3 deletionsCode/Mantid/Framework/Algorithms/test/ExtractSpectraTest.h
- Code/Mantid/Framework/Algorithms/test/ProcessIndirectFitParametersTest.h 250 additions, 0 deletions...mework/Algorithms/test/ProcessIndirectFitParametersTest.h
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h 3 additions, 0 deletions...d/Framework/DataHandling/inc/MantidDataHandling/LoadRKH.h
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h 4 additions, 0 deletions...d/Framework/DataHandling/inc/MantidDataHandling/SaveCSV.h
- Code/Mantid/Framework/DataHandling/src/LoadRKH.cpp 85 additions, 14 deletionsCode/Mantid/Framework/DataHandling/src/LoadRKH.cpp
- Code/Mantid/Framework/DataHandling/src/SaveCSV.cpp 31 additions, 0 deletionsCode/Mantid/Framework/DataHandling/src/SaveCSV.cpp
- Code/Mantid/Framework/DataHandling/src/SaveRKH.cpp 18 additions, 1 deletionCode/Mantid/Framework/DataHandling/src/SaveRKH.cpp
Loading
Please register or sign in to comment