Skip to content
Snippets Groups Projects
Select Git revision
20 results
Blame Permalink
  • Nick Draper's avatar
    95d7e8b2
    Merge branch 'master' of github.com:mantidproject/mantid into... · 95d7e8b2
    Nick Draper authored 
    Merge branch 'master' of github.com:mantidproject/mantid into 16935_ConvertUnitsUsingDetectorTableEmodeBug

re #16935
# Conflicts:
#	Framework/Algorithms/src/ConvertUnits.cpp
#	Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
#	Framework/Algorithms/test/ConvertUnitsUsingDetectorTableTest.h
    95d7e8b2
    History
    Merge branch 'master' of github.com:mantidproject/mantid into...
    Nick Draper authored 
    Merge branch 'master' of github.com:mantidproject/mantid into 16935_ConvertUnitsUsingDetectorTableEmodeBug

re #16935
# Conflicts:
#	Framework/Algorithms/src/ConvertUnits.cpp
#	Framework/Algorithms/src/ConvertUnitsUsingDetectorTable.cpp
#	Framework/Algorithms/test/ConvertUnitsUsingDetectorTableTest.h
Code owners
Assign users and groups as approvers for specific file changes. Learn more.