?
?
Lol
Merge branch 'master' of https://github.com/mchabran/LO21

Conflicts:
	ProjetQt/ProjetQt.pro.user
	ProjetQt/main.cpp
Passage dossier modifié