Merge branch 'master' of cgogn:~thery/CGoGN
Conflicts: include/Utils/qtgl.h src/Algo/Render/mapRender.cpp src/Utils/qtgl.cpp src/Utils/qtinputs.cpp
Showing
Please register or sign in to comment
Conflicts: include/Utils/qtgl.h src/Algo/Render/mapRender.cpp src/Utils/qtgl.cpp src/Utils/qtinputs.cpp