Framework/Algorithms/src/CrossCorrelate.cpp · dd9f554f6725df8a0227882ca4331fff1be492ea · mantidproject / mantid

9 years ago

Merge branch 'master' of github.com:mantidproject/mantid into 15450_spectrum_index_corrections · 1f6e997e

Nick Draper authored 9 years ago

# Conflicts:
#	MantidPlot/src/Mantid/MantidUI.cpp
#	MantidQt/CustomInterfaces/src/SANSDiagnostics.cpp
#	MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp

re #15450

1f6e997e

History

Merge branch 'master' of github.com:mantidproject/mantid into 15450_spectrum_index_corrections

Nick Draper authored 9 years ago

# Conflicts:
#	MantidPlot/src/Mantid/MantidUI.cpp
#	MantidQt/CustomInterfaces/src/SANSDiagnostics.cpp
#	MantidQt/SpectrumViewer/src/MatrixWSDataSource.cpp

re #15450

Code owners

Assign users and groups as approvers for specific file changes. Learn more.