Merge branch 'feature/5300_moments_sqw_tab' into develop

Refs #5300 Conflicts: Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp
mantidproject · Mar 10, 2014 · 1470a22 · 1470a22
2 parents f2e8088 + 8d6ca4c
commit 1470a22
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt b/Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
@@ -74,15 +74,16 @@ set ( INC_FILES
 	inc/MantidQtCustomInterfaces/IndirectBayesTab.h
 	inc/MantidQtCustomInterfaces/IndirectDataAnalysis.h
 	inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.h
-	inc/MantidQtCustomInterfaces/IndirectLoadAscii.h
-	inc/MantidQtCustomInterfaces/IndirectLoadAsciiTab.h
-	inc/MantidQtCustomInterfaces/IndirectMolDyn.h
+  inc/MantidQtCustomInterfaces/IndirectLoadAscii.h
+  inc/MantidQtCustomInterfaces/IndirectLoadAsciiTab.h
+  inc/MantidQtCustomInterfaces/IndirectMolDyn.h
   inc/MantidQtCustomInterfaces/IndirectMoments.h
-	inc/MantidQtCustomInterfaces/IndirectNeutron.h
+  inc/MantidQtCustomInterfaces/IndirectNeutron.h
 	inc/MantidQtCustomInterfaces/JumpFit.h
 	inc/MantidQtCustomInterfaces/MSDFit.h
 	inc/MantidQtCustomInterfaces/MantidEV.h
 	inc/MantidQtCustomInterfaces/MantidEVWorker.h
+	inc/MantidQtCustomInterfaces/MuonAnalysis.h
 	inc/MantidQtCustomInterfaces/MuonAnalysisFitDataTab.h
 	inc/MantidQtCustomInterfaces/MuonAnalysisHelper.h
 	inc/MantidQtCustomInterfaces/MuonAnalysisOptionTab.h