Merge branch 'feature/6977_remove_flatbackground_alg' into develop

Conflicts: Code/Mantid/Framework/Algorithms/CMakeLists.txt Refs #6977
mantidproject · Oct 4, 2013 · 2f0471b · 2f0471b
2 parents 630c25c + fb38f4d
commit 2f0471b
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 739 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -105,7 +105,6 @@ set ( SRC_FILES
 	src/FindPeakBackground.cpp
 	src/FindPeaks.cpp
 	src/FixGSASInstrumentFile.cpp
-	src/FlatBackground.cpp
 	src/FlatPlateAbsorption.cpp
 	src/GeneralisedSecondDifference.cpp
 	src/GenerateEventsFilter.cpp
@@ -331,7 +330,6 @@ set ( INC_FILES
 	inc/MantidAlgorithms/FindPeakBackground.h
 	inc/MantidAlgorithms/FindPeaks.h
 	inc/MantidAlgorithms/FixGSASInstrumentFile.h
-	inc/MantidAlgorithms/FlatBackground.h
 	inc/MantidAlgorithms/FlatPlateAbsorption.h
 	inc/MantidAlgorithms/GSLFunctions.h
 	inc/MantidAlgorithms/GeneralisedSecondDifference.h
@@ -561,7 +559,6 @@ set ( TEST_FILES
 	FindPeakBackgroundTest.h
 	FindPeaksTest.h
 	FixGSASInstrumentFileTest.h
-	FlatBackgroundTest.h
 	FlatPlateAbsorptionTest.h
 	GenerateEventsFilterTest.h
 	GeneratePeaksTest.h

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/FlatBackground.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/FlatBackground.h