# Conflicts:
#	Core/Instrument/DetectorMask.cpp
#	Core/Samples/BAVersion.h
#	Fit/Minimizer/MinimizerFactory.cpp
#	Fit/Minimizer/TrivialMinimizer.cpp
#	Wrap/swig/libBornAgainFit.i
#	auto/Wrap/libBornAgainCore.py
#	auto/Wrap/libBornAgainCore_wrap.cpp
#	auto/Wrap/libBornAgainFit_wrap.cpp