Framework/Algorithms/src/CreateFlatEventWorkspace.cpp · fff4483f76250156028a02fbdca392aa5241e049 · mantidproject / mantid

"...Algorithms/git@code.ornl.gov:mantidproject/mantid.git" did not exist on "b9e2301d780269fa3adffc5d561b262345475499"

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.