Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp · 39411b6090d075f607a3940651e18fdcf34bddd7 · mantidproject / mantid

10 years ago

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into... · 39411b60

Dan Nixon authored 10 years ago

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp

Refs #10083

39411b60

History

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into...

Dan Nixon authored 10 years ago

Merge branch 'bugfix/10085_indirect_algorithm_CreateMappingFile' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp

Refs #10083

Code owners

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