Etienne Schmitt authored Mar 23, 2015 and Pierre Kraemer committed Apr 01, 2015

Signed-off-by: Étienne Schmitt <etienne.schmitt@inria.fr>

Conflicts:
	CGoGN/src/Utils/GLSLShader.cpp

Develop

See merge request !55

Conflicts:
	CGoGN/src/Utils/Shaders/shaderPhong.cpp
	CGoGN/src/Utils/Shaders/shaderSimpleFlat.cpp

Develop

See merge request !53

Develop

See merge request !52

Develop

See merge request !51

Develop

See merge request !50

Develop

See merge request !49

Conflicts:
	SCHNApps/Plugins/surface_modelisation/src/surface_modelisation.cpp
	SCHNApps/include/types.h
	SCHNApps/include/view.h
	SCHNApps/src/schnapps.cpp
	SCHNApps/src/view.cpp
	ThirdParty/OpenNL/CMakeLists.txt