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

9 years ago

Merge branch 'master' into 15289_declareProperty_uniqueptr · bdce1bfe

Tom Perkins authored 9 years ago

re #15289

# Conflicts:
#	Framework/DataHandling/src/GroupDetectors.cpp
#	Framework/DataHandling/src/GroupDetectors2.cpp
#	Framework/DataHandling/src/LoadMuonNexus.cpp
#	Framework/DataHandling/src/LoadRaw3.cpp
#	Framework/DataHandling/src/LoadRawBin0.cpp
#	Framework/DataHandling/src/LoadTOFRawNexus.cpp
#	Framework/DataHandling/src/MaskDetectors.cpp
#	Framework/LiveData/src/ISISHistoDataListener.cpp
#	Framework/LiveData/src/StartLiveData.cpp
#	Framework/LiveData/test/ISISHistoDataListenerTest.h

bdce1bfe

History

Merge branch 'master' into 15289_declareProperty_uniqueptr

Tom Perkins authored 9 years ago

re #15289

# Conflicts:
#	Framework/DataHandling/src/GroupDetectors.cpp
#	Framework/DataHandling/src/GroupDetectors2.cpp
#	Framework/DataHandling/src/LoadMuonNexus.cpp
#	Framework/DataHandling/src/LoadRaw3.cpp
#	Framework/DataHandling/src/LoadRawBin0.cpp
#	Framework/DataHandling/src/LoadTOFRawNexus.cpp
#	Framework/DataHandling/src/MaskDetectors.cpp
#	Framework/LiveData/src/ISISHistoDataListener.cpp
#	Framework/LiveData/src/StartLiveData.cpp
#	Framework/LiveData/test/ISISHistoDataListenerTest.h

Code owners

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