Skip to content
Find file Blame History Permalink
  • Nick Draper's avatar
    Merge remote-tracking branch 'origin' into 15450_specid_t_to_specnum_t · 1c21c454
    Nick Draper authored 
    re #15450
# Conflicts:
#	Framework/API/inc/MantidAPI/MatrixWorkspace.h
#	Framework/API/src/MatrixWorkspace.cpp
#	Framework/Algorithms/src/GeneratePeaks.cpp
#	Framework/Algorithms/src/GetEi.cpp
#	Framework/DataHandling/inc/MantidDataHandling/EventWorkspaceCollection.h
#	Framework/DataHandling/src/EventWorkspaceCollection.cpp
#	Framework/DataHandling/test/LoadISISNexusTest.h
    1c21c454