Framework/Algorithms/src/ConvertAxisByFormula.cpp · 43a30ca1d2a8a5cf4062b4c588450ce8b33e4754 · mantidproject / mantid

8 years ago

Merge branch 'master' into 16282_histogram_y_e · 11f8468d

Simon Heybrock authored 8 years ago

Conflicts:
	Framework/API/inc/MantidAPI/ISpectrum.h
	Framework/DataObjects/inc/MantidDataObjects/EventWorkspaceMRU.h
	Framework/DataObjects/src/EventList.cpp
	Framework/DataObjects/src/EventWorkspaceMRU.cpp

11f8468d

History

Merge branch 'master' into 16282_histogram_y_e

Simon Heybrock authored 8 years ago

Conflicts:
	Framework/API/inc/MantidAPI/ISpectrum.h
	Framework/DataObjects/inc/MantidDataObjects/EventWorkspaceMRU.h
	Framework/DataObjects/src/EventList.cpp
	Framework/DataObjects/src/EventWorkspaceMRU.cpp

Code owners

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