Merge branch 'master' of cgogn:/home/maire/CGoGN
Conflicts: src/Utils/Shaders/shaderPhong.cpp
Apps/Examples/clipping.cpp
0 → 100644
This diff is collapsed.
Apps/Examples/clipping.ui
0 → 100644
Conflicts: src/Utils/Shaders/shaderPhong.cpp