Merge branch 'master' of cgogn:~kraemer/CGoGN
Conflicts: include/Utils/qtSimple.h include/Utils/qtgl.h src/Utils/qtSimple.cpp src/Utils/qtgl.cpp
Showing
Conflicts: include/Utils/qtSimple.h include/Utils/qtgl.h src/Utils/qtSimple.cpp src/Utils/qtgl.cpp