blabla
merge branch 'master' of https://github.com/goujonpa/UTProfiler

Conflicts:
	UTProfiler.pro.user
	manager.h
	preference.h
Merge branch 'master' of https://github.com/goujonpa/UTProfiler

Conflicts:
	UTProfiler.pro.user
	mainwindow.cpp
Bonzour
improvement doxygen
Merge branch 'master' of https://github.com/goujonpa/UTProfiler

Conflicts:
	UTProfiler.pro.user
	branche.h
	cursus.h
	profil.h
Merge branch 'master' of https://github.com/goujonpa/UTProfiler

Conflicts:
	UTProfiler.pro.user
	profil.h
	uv.h
caca
a
doxygen
doxy