Merge branch 'master' into feature/10376_refl_ui_menu_bar
Refs #10376 Conflicts: Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
Showing
- Code/Mantid/Build/class_maker.py 3 additions, 1 deletionCode/Mantid/Build/class_maker.py
- Code/Mantid/Framework/DataHandling/CMakeLists.txt 2 additions, 0 deletionsCode/Mantid/Framework/DataHandling/CMakeLists.txt
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h 10 additions, 0 deletions...work/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h 3 additions, 0 deletions...Framework/DataHandling/inc/MantidDataHandling/LoadNXSPE.h
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h 106 additions, 0 deletions...ramework/DataHandling/inc/MantidDataHandling/SaveNXTomo.h
- Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp 135 additions, 20 deletionsCode/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp
- Code/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp 315 additions, 291 deletionsCode/Mantid/Framework/DataHandling/src/LoadNXSPE.cpp
- Code/Mantid/Framework/DataHandling/src/LoadNexusMonitors.cpp 1 addition, 0 deletionsCode/Mantid/Framework/DataHandling/src/LoadNexusMonitors.cpp
- Code/Mantid/Framework/DataHandling/src/SaveNXTomo.cpp 398 additions, 0 deletionsCode/Mantid/Framework/DataHandling/src/SaveNXTomo.cpp
- Code/Mantid/Framework/DataHandling/test/LoadEventNexusTest.h 29 additions, 1 deletionCode/Mantid/Framework/DataHandling/test/LoadEventNexusTest.h
- Code/Mantid/Framework/DataHandling/test/LoadNXSPETest.h 12 additions, 10 deletionsCode/Mantid/Framework/DataHandling/test/LoadNXSPETest.h
- Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/EventWorkspace.h 2 additions, 0 deletions...mework/DataObjects/inc/MantidDataObjects/EventWorkspace.h
- Code/Mantid/Framework/DataObjects/src/EventWorkspace.cpp 23 additions, 0 deletionsCode/Mantid/Framework/DataObjects/src/EventWorkspace.cpp
- Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/IndirectResolution.py 10 additions, 20 deletions...ugins/algorithms/WorkflowAlgorithms/IndirectResolution.py
- Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/MSGDiffractionReduction.py 7 additions, 0 deletions.../algorithms/WorkflowAlgorithms/MSGDiffractionReduction.py
- Code/Mantid/MantidPlot/src/ApplicationWindow.cpp 96 additions, 28 deletionsCode/Mantid/MantidPlot/src/ApplicationWindow.cpp
- Code/Mantid/MantidPlot/src/ApplicationWindow.h 16 additions, 4 deletionsCode/Mantid/MantidPlot/src/ApplicationWindow.h
- Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp 31 additions, 0 deletionsCode/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
- Code/Mantid/MantidPlot/src/Mantid/MantidUI.h 4 additions, 0 deletionsCode/Mantid/MantidPlot/src/Mantid/MantidUI.h
- Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.h 1 addition, 0 deletions...c/MantidQtCustomInterfaces/IndirectDiffractionReduction.h
Loading
Please register or sign in to comment