Tex
Merge branch 'master' of https://github.com/allinard/miniEditeurGL.git

Conflicts:
	src/main/resources/doc/rapportV1.tex