# Conflicts:
#	Base
#	CMakeLists.txt
#	NSolver/ConstraintTools.cc
#	Solver/ConstrainedSolver.hh
#	Solver/ConstrainedSolverT_impl.hh
#	Solver/Eigen_Tools.cc
#	Solver/Eigen_Tools.hh
#	cmake-library
#	cmake/FindGMM.cmake