Code/Mantid/MantidQt/CustomInterfaces/src/IndirectConvertToEnergy.cpp · 6af92784c4f49d4601b51e75d50f3d321367f4b3 · mantidproject / mantid

10 years ago

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring · 6af92784

Dan Nixon authored 10 years ago

Conflicts:
	Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
	Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py
	Code/Mantid/scripts/Inelastic/msg_reducer.py

Refs #10083

6af92784

History

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

Dan Nixon authored 10 years ago

Conflicts:
	Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CMakeLists.txt
	Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py
	Code/Mantid/scripts/Inelastic/msg_reducer.py

Refs #10083

Code owners

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