Merge remote-tracking branch 'origin/master' into 13776_remove_old_output_workspaces
Conflicts: Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp Re #13776.
No related branches found
No related tags found
Showing
- Code/Mantid/Build/CMake/VersionNumber.cmake 1 addition, 1 deletionCode/Mantid/Build/CMake/VersionNumber.cmake
- Code/Mantid/Build/Jenkins/doctests 6 additions, 3 deletionsCode/Mantid/Build/Jenkins/doctests
- Code/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h 8 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IMDEventWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h 2 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IMDHistoWorkspace.h
- Code/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h 3 additions, 0 deletionsCode/Mantid/Framework/API/inc/MantidAPI/IMDWorkspace.h
- Code/Mantid/Framework/API/src/IMDWorkspace.cpp 7 additions, 0 deletionsCode/Mantid/Framework/API/src/IMDWorkspace.cpp
- Code/Mantid/Framework/Algorithms/src/RemovePromptPulse.cpp 6 additions, 2 deletionsCode/Mantid/Framework/Algorithms/src/RemovePromptPulse.cpp
- Code/Mantid/Framework/Algorithms/src/SetUncertainties.cpp 8 additions, 1 deletionCode/Mantid/Framework/Algorithms/src/SetUncertainties.cpp
- Code/Mantid/Framework/Algorithms/test/MayersSampleCorrectionStrategyTest.h 0 additions, 4 deletions...work/Algorithms/test/MayersSampleCorrectionStrategyTest.h
- Code/Mantid/Framework/DataHandling/CMakeLists.txt 2 additions, 0 deletionsCode/Mantid/Framework/DataHandling/CMakeLists.txt
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h 77 additions, 0 deletions.../DataHandling/inc/MantidDataHandling/SaveOpenGenieAscii.h
- Code/Mantid/Framework/DataHandling/src/LoadDiffCal.cpp 2 additions, 2 deletionsCode/Mantid/Framework/DataHandling/src/LoadDiffCal.cpp
- Code/Mantid/Framework/DataHandling/src/LoadFITS.cpp 31 additions, 35 deletionsCode/Mantid/Framework/DataHandling/src/LoadFITS.cpp
- Code/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp 4 additions, 4 deletionsCode/Mantid/Framework/DataHandling/src/LoadSpice2D.cpp
- Code/Mantid/Framework/DataHandling/src/SaveGSS.cpp 25 additions, 0 deletionsCode/Mantid/Framework/DataHandling/src/SaveGSS.cpp
- Code/Mantid/Framework/DataHandling/src/SaveOpenGenieAscii.cpp 304 additions, 0 deletions.../Mantid/Framework/DataHandling/src/SaveOpenGenieAscii.cpp
- Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h 13 additions, 3 deletions...mework/DataObjects/inc/MantidDataObjects/MDEventFactory.h
- Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h 13 additions, 1 deletion...work/DataObjects/inc/MantidDataObjects/MDEventWorkspace.h
- Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc 45 additions, 6 deletions...rk/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
- Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/MDHistoWorkspace.h 15 additions, 3 deletions...work/DataObjects/inc/MantidDataObjects/MDHistoWorkspace.h
Loading
Please register or sign in to comment