Merge remote-tracking branch 'origin/feature/10660_remove_stitch1dmd'

mantidproject · Nov 28, 2014 · 6d79750 · 6d79750
2 parents 1030fae + 2a17c89
commit 6d79750
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 1,040 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt b/Code/Mantid/Framework/MDAlgorithms/CMakeLists.txt
@@ -70,7 +70,6 @@ set ( SRC_FILES
 	src/SetMDUsingMask.cpp
 	src/SliceMD.cpp
 	src/SlicingAlgorithm.cpp
-	src/Stitch1DMD.cpp
 	src/ThresholdMD.cpp
 	src/TransformMD.cpp
 	src/UnaryOperationMD.cpp
@@ -153,7 +152,6 @@ set ( INC_FILES
 	inc/MantidMDAlgorithms/SetMDUsingMask.h
 	inc/MantidMDAlgorithms/SliceMD.h
 	inc/MantidMDAlgorithms/SlicingAlgorithm.h
-	inc/MantidMDAlgorithms/Stitch1DMD.h
 	inc/MantidMDAlgorithms/ThresholdMD.h
 	inc/MantidMDAlgorithms/TransformMD.h
 	inc/MantidMDAlgorithms/UnaryOperationMD.h
@@ -225,7 +223,6 @@ set ( TEST_FILES
 	SimulateResolutionConvolvedModelTest.h
 	SliceMDTest.h
 	SlicingAlgorithmTest.h
-	Stitch1DMDTest.h
 	Strontium122Test.h
 	ThresholdMDTest.h
 	TobyFitBMatrixTest.h

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Stitch1DMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Stitch1DMD.h