Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into 11708_vsi_keep_settings_on_each_view_for_workspaces_within_a_session Conflicts: Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/StandardView.h Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/StandardView.cpp Sort out merge conflict that arised after another VSI related branch was merged into master, re #11708
No related branches found
No related tags found
Showing
- Code/Mantid/Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp 89 additions, 55 deletions...amework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
- Code/Mantid/Framework/Algorithms/src/CreatePSDBleedMask.cpp 10 additions, 3 deletionsCode/Mantid/Framework/Algorithms/src/CreatePSDBleedMask.cpp
- Code/Mantid/Framework/Algorithms/src/NormaliseByCurrent.cpp 5 additions, 5 deletionsCode/Mantid/Framework/Algorithms/src/NormaliseByCurrent.cpp
- Code/Mantid/Framework/Algorithms/test/ConvertUnitsUsingDetectorTableTest.h 7 additions, 6 deletions...work/Algorithms/test/ConvertUnitsUsingDetectorTableTest.h
- Code/Mantid/Framework/Algorithms/test/NormaliseByCurrentTest.h 18 additions, 0 deletions...Mantid/Framework/Algorithms/test/NormaliseByCurrentTest.h
- Code/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp 6 additions, 0 deletionsCode/Mantid/Framework/DataHandling/src/LoadCanSAS1D.cpp
- Code/Mantid/Framework/DataHandling/src/LoadGSS.cpp 17 additions, 8 deletionsCode/Mantid/Framework/DataHandling/src/LoadGSS.cpp
- Code/Mantid/Framework/DataHandling/src/RenameLog.cpp 2 additions, 2 deletionsCode/Mantid/Framework/DataHandling/src/RenameLog.cpp
- Code/Mantid/Framework/DataHandling/test/LoadGSSTest.h 48 additions, 8 deletionsCode/Mantid/Framework/DataHandling/test/LoadGSSTest.h
- Code/Mantid/Framework/DataHandling/test/RenameLogTest.h 78 additions, 31 deletionsCode/Mantid/Framework/DataHandling/test/RenameLogTest.h
- Code/Mantid/Framework/LiveData/CMakeLists.txt 5 additions, 3 deletionsCode/Mantid/Framework/LiveData/CMakeLists.txt
- Code/Mantid/Framework/LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h 129 additions, 0 deletions.../LiveData/inc/MantidLiveData/TOPAZLiveEventDataListener.h
- Code/Mantid/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp 665 additions, 0 deletions...tid/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp
- Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CutMD.h 7 additions, 2 deletions...tid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CutMD.h
- Code/Mantid/Framework/MDAlgorithms/src/CutMD.cpp 73 additions, 5 deletionsCode/Mantid/Framework/MDAlgorithms/src/CutMD.cpp
- Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp 1 addition, 0 deletions...PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp
- Code/Mantid/Framework/PythonInterface/plugins/algorithms/LiquidsReflectometryReduction.py 2 additions, 0 deletions...rface/plugins/algorithms/LiquidsReflectometryReduction.py
- Code/Mantid/Framework/PythonInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py 1 addition, 1 deletion...nInterface/plugins/algorithms/PoldiCreatePeaksFromFile.py
- Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py 9 additions, 1 deletion...e/plugins/algorithms/WorkflowAlgorithms/TransformToIqt.py
- Code/Mantid/MantidPlot/src/Graph.cpp 30 additions, 0 deletionsCode/Mantid/MantidPlot/src/Graph.cpp
Loading
Please register or sign in to comment