Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainViewPresenter.h · d48fb15186e08856c0a60b4ac6a543c06da1e211 · mantidproject / mantid

10 years ago

Merge branch 'master' into feature/10431_refl_presenter_use_model · ebd4ecb9

Harry Jeffery authored 10 years ago

Refs #10431

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
	Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
	Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h

ebd4ecb9

History

Merge branch 'master' into feature/10431_refl_presenter_use_model

Harry Jeffery authored 10 years ago

Refs #10431

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ReflMainView.h
	Code/Mantid/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp
	Code/Mantid/MantidQt/CustomInterfaces/test/ReflMainViewMockObjects.h

Code owners

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