Framework/Algorithms/src/ConvertEmptyToTof.cpp · 715820e86e2c665bf4c70ca2329c5ac0bf1dde0d · mantidproject / mantid

"scripts/Muon/git@code.ornl.gov:mantidproject/mantid.git" did not exist on "5af8c6951d898f3659d61b4e7ed15777b9b6e3db"

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.