# Conflicts:
#	MantidPlot/src/ScriptingWindow.cpp
#	qt/scientific_interfaces/DynamicPDF/DPDFBackgroundRemover.cpp
#	qt/scientific_interfaces/DynamicPDF/SliceSelector.cpp
#	qt/scientific_interfaces/General/SampleTransmission.cpp
#	qt/scientific_interfaces/Indirect/IndirectBayes.cpp
#	qt/scientific_interfaces/Indirect/IndirectCorrections.cpp
#	qt/scientific_interfaces/Indirect/IndirectDataAnalysis.cpp
#	qt/scientific_interfaces/Indirect/IndirectDataReduction.cpp
#	qt/scientific_interfaces/Indirect/IndirectDiffractionReduction.cpp
#	qt/scientific_interfaces/Indirect/IndirectSimulation.cpp
#	qt/scientific_interfaces/Indirect/IndirectTools.cpp
#	qt/scientific_interfaces/Muon/ALCBaselineModellingView.cpp
#	qt/scientific_interfaces/Muon/ALCDataLoadingView.cpp
#	qt/scientific_interfaces/Muon/ALCPeakFittingView.cpp
#	qt/widgets/spectrumviewer/src/SVConnections.cpp
#	scripts/DGSPlanner/DGSPlannerGUI.py
#	scripts/HFIRPowderReduction/HfirPDReductionGUI.py