Merge branch 'master' into 11163_ill_calibration_tab
Conflicts: Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDataReduction.cpp Refs #11163
No related branches found
No related tags found
Showing
- Code/Mantid/Framework/Algorithms/CMakeLists.txt 5 additions, 5 deletionsCode/Mantid/Framework/Algorithms/CMakeLists.txt
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PDEstimateDetectorResolution.h 19 additions, 16 deletions...ithms/inc/MantidAlgorithms/PDEstimateDetectorResolution.h
- Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PhaseQuadMuon.h 1 addition, 1 deletion...Framework/Algorithms/inc/MantidAlgorithms/PhaseQuadMuon.h
- Code/Mantid/Framework/Algorithms/src/PDEstimateDetectorResolution.cpp 87 additions, 56 deletions...Framework/Algorithms/src/PDEstimateDetectorResolution.cpp
- Code/Mantid/Framework/Algorithms/test/PDEstimateDetectorResolutionTest.h 29 additions, 29 deletions...mework/Algorithms/test/PDEstimateDetectorResolutionTest.h
- Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h 1 addition, 0 deletions...work/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
- Code/Mantid/Framework/DataHandling/src/DownloadInstrument.cpp 1 addition, 2 deletions.../Mantid/Framework/DataHandling/src/DownloadInstrument.cpp
- Code/Mantid/Framework/DataHandling/src/ISISDataArchive.cpp 12 additions, 24 deletionsCode/Mantid/Framework/DataHandling/src/ISISDataArchive.cpp
- Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp 19 additions, 11 deletionsCode/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp
- Code/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp 11 additions, 23 deletionsCode/Mantid/Framework/DataHandling/src/SNSDataArchive.cpp
- Code/Mantid/Framework/Kernel/inc/MantidKernel/InternetHelper.h 50 additions, 4 deletions...Mantid/Framework/Kernel/inc/MantidKernel/InternetHelper.h
- Code/Mantid/Framework/Kernel/src/InternetHelper.cpp 31 additions, 29 deletionsCode/Mantid/Framework/Kernel/src/InternetHelper.cpp
- Code/Mantid/Framework/MDAlgorithms/src/LoadMD.cpp 2 additions, 1 deletionCode/Mantid/Framework/MDAlgorithms/src/LoadMD.cpp
- Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBoxFlatTree.h 2 additions, 1 deletion...tid/Framework/MDEvents/inc/MantidMDEvents/MDBoxFlatTree.h
- Code/Mantid/Framework/MDEvents/src/MDBoxFlatTree.cpp 26 additions, 17 deletionsCode/Mantid/Framework/MDEvents/src/MDBoxFlatTree.cpp
- Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt 4 additions, 0 deletionsCode/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
- Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/CalcCorr.ui 141 additions, 84 deletions...erfaces/inc/MantidQtCustomInterfaces/Indirect/CalcCorr.ui
- Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.h 62 additions, 0 deletions...inc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.h
- Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.ui 192 additions, 0 deletions...nc/MantidQtCustomInterfaces/Indirect/ILLEnergyTransfer.ui
- Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/CalcCorr.cpp 0 additions, 2 deletions...antid/MantidQt/CustomInterfaces/src/Indirect/CalcCorr.cpp
Loading
Please register or sign in to comment