refs #6856 Merge conflicts · mantidproject/mantid@355e0a0 · GitHub

Commit

refs #6856 Merge conflicts

Browse files

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop

Conflicts:
	Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
	Code/Mantid/Framework/PythonInterface/plugins/algorithms/SNSPowderReduction.py

Loading branch information

abuts committed May 24, 2013

2 parents 444920a + 27045d9 commit 355e0a0