Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp · 1c94c78778287069930b6878b29603dee5dba7f7 · mantidproject / mantid

10 years ago

Merge branch 'master' into bugfix/9338_consistent_ida_miniplot_spectra_options · 1c94c787

Dan Nixon authored 10 years ago

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Refs #9338

1c94c787

History

Merge branch 'master' into bugfix/9338_consistent_ida_miniplot_spectra_options

Dan Nixon authored 10 years ago

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Refs #9338

Code owners

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