Signed-off-by: mchabran <marine.chabran@gmail.com>
ajout CursusManager mais pas fini du tout
Signed-off-by: mchabran <marine.chabran@gmail.com>
CursusManager qui marche (chargement)
Signed-off-by: mchabran <marine.chabran@gmail.com>
ajout UTProfiler.cpp ?
Signed-off-by: mchabran <marine.chabran@gmail.com>
Merge branch 'master' of github.com:mchabran/LO21

Résolution de conflits
Conflicts:
	ProjetQt/ProjetQt.pro.user
	ProjetQt/UVEditeur.cpp
	ProjetQt/cursus.h
	ProjetQt/main.cpp
	build-ProjetQt-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Makefile.Debug
	build-ProjetQt-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Makefile.Release

Signed-off-by: mchabran <marine.chabran@gmail.com>