Modification dans projet : code de COnrad
	new file:   Projet/codeConrad/ElFini/ElFini.pro
	new file:   Projet/codeConrad/ElFini/carre.cpp
	new file:   Projet/codeConrad/ElFini/carre.h
	new file:   Projet/codeConrad/ElFini/elementfini.cpp
	new file:   Projet/codeConrad/ElFini/elementfini.h
	new file:   Projet/codeConrad/ElFini/elementfinir2.cpp
	new file:   Projet/codeConrad/ElFini/elementfinir2.h
	new file:   Projet/codeConrad/ElFini/fonction.cpp
	new file:   Projet/codeConrad/ElFini/fonction.h
	new file:   Projet/codeConrad/ElFini/formbilin.cpp
	new file:   Projet/codeConrad/ElFini/formbilin.h
	new file:   Projet/codeConrad/ElFini/formbilinr2p1.cpp
	new file:   Projet/codeConrad/ElFini/formbilinr2p1.h
	new file:   Projet/codeConrad/ElFini/geometrie.cpp
	new file:   Projet/codeConrad/ElFini/geometrie.h
	new file:   Projet/codeConrad/ElFini/geometrier2.cpp
	new file:   Projet/codeConrad/ElFini/geometrier2.h
	new file:   Projet/codeConrad/ElFini/integer_part.c
	new file:   Projet/codeConrad/ElFini/maillage.cpp
	new file:   Projet/codeConrad/ElFini/maillage.h
	new file:   Projet/codeConrad/ElFini/maillager2.cpp
	new file:   Projet/codeConrad/ElFini/maillager2.h
	new file:   Projet/codeConrad/ElFini/main.cpp
	new file:   Projet/codeConrad/ElFini/restfctbase.cpp
	new file:   Projet/codeConrad/ElFini/restfctbase.h
	new file:   Projet/codeConrad/ElFini/restfctbaser2.cpp
	new file:   Projet/codeConrad/ElFini/restfctbaser2.h
	new file:   Projet/codeConrad/ElFini/restfctbaser2p1.cpp
	new file:   Projet/codeConrad/ElFini/restfctbaser2p1.h
	new file:   Projet/codeConrad/ElFini/sommet.cpp
	new file:   Projet/codeConrad/ElFini/sommet.h
	new file:   Projet/codeConrad/ElFini/sommetr2.cpp
	new file:   Projet/codeConrad/ElFini/sommetr2.h
	new file:   Projet/codeConrad/ElFini/triangle.cpp
	new file:   Projet/codeConrad/ElFini/triangle.h
	modified:   cpp/defVue/build-Vue-Desktop_Qt_5_2_1_GCC_64bit-Debug/Vue
	modified:   cpp/defVue/build-Vue-Desktop_Qt_5_2_1_GCC_64bit-Debug/fenetre.o
	modified:   cpp/defVue/build-Vue-Desktop_Qt_5_2_1_GCC_64bit-Debug/implemgraphviz.o
	modified:   cpp/defVue/build-Vue-Desktop_Qt_5_2_1_GCC_64bit-Debug/main.o
	modified:   cpp/defVue/build-Vue-Desktop_Qt_5_2_1_GCC_64bit-Debug/messagehandler.o
	modified:   cpp/defVue/build-Vue-Desktop_Qt_5_2_1_GCC_64bit-Debug/moc_fenetre.o
	modified:   cpp/defVue/build-Vue-Desktop_Qt_5_2_1_GCC_64bit-Debug/moc_xmltree.o
	modified:   cpp/defVue/codes/Vue.pro.user
	modified:   cpp/defVue/codes/Vue/fenetre.cpp
	modified:   cpp/defVue/codes/Vue/implemgraphviz.cpp
Merge branch 'master' of https://github.com/avieira/GM4-2

Conflicts:
	cpp/defVue/codes/Vue.pro.user

	modified:   MecaFlux/Projet/Rapport.pdf
	modified:   MecaFlux/Projet/dvpmt.aux
	modified:   MecaFlux/Projet/dvpmt.tex
	modified:   MecaFlux/Projet/intro.tex
	modified:   MecaFlux/Projet/rapport.fdb_latexmk
	modified:   MecaFlux/Projet/rapport.log
	modified:   MecaFlux/Projet/rapport.toc
	modified:   MecaFlux/Projet/resultsCx/Remorque2-110_VelocityVectors.png
	modified:   MecaFlux/Projet/resultsCx/camion110_pressure.png
	modified:   MecaFlux/Projet/resultsCx/camion110_stream.png
	modified:   MecaFlux/Projet/resultsCx/camion110_velocityVectors.png
	deleted:    MecaFlux/Projet/resultsCx/remorqu2-hautCabineAbsorption.png
	modified:   MecaFlux/Projet/resultsCx/remorque2-110_pressure.png
	new file:   MecaFlux/Projet/resultsCx/remorque2-hautCabineAbsorption.png
	modified:   MecaFlux/Projet/resultsCx/remorque2_110_stream.png
	modified:   cpp/defVue/codes/Vue.pro
	modified:   cpp/defVue/codes/Vue.pro.user
	modified:   cpp/defVue/codes/Vue/implemgraphviz.h