Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp · dbc3eb2862d247fc322b697cbe29712d59e18fab · mantidproject / mantid

13 years ago

Merge branch 'save_peaks_nexus' re #4137 · 6d59e0a8

Karl Palmen authored 13 years ago


Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
	Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp
	Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
	Code/Mantid/Framework/DataObjects/src/PeaksWorkspace.cpp

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

6d59e0a8

History

Merge branch 'save_peaks_nexus' re #4137

Karl Palmen authored 13 years ago


Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadNexusProcessed.cpp
	Code/Mantid/Framework/DataHandling/src/SaveNexusProcessed.cpp
	Code/Mantid/Framework/DataObjects/inc/MantidDataObjects/PeaksWorkspace.h
	Code/Mantid/Framework/DataObjects/src/PeaksWorkspace.cpp

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>

Code owners

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