modified:   Projet/rapportSV/EFtheorique.tex
	modified:   Projet/rapportSV/eqNS.tex
	modified:   Projet/rapportSV/rapport.pdf
	modified:   Projet/rapportSV/rapport.tex
	modified:   cpp/ReDefVue/ReDefVue.pro.user
Merge branch 'master' of https://github.com/avieira/GM4-2

Conflicts:
	cpp/ReDefVue/ReDefVue.pro.user

Bug
	modified:   cpp/ReDefVue/Vue/xmltree.cpp