Commit 6af92784 authored 10 years ago by Dan Nixon

Merge branch 'master' into bugfix/10083_inelastic_indirect_reducer_algorithm_refactoring

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

parents d813dc75 f99c1c96

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 400 additions and 279 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment