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

using boost::regex if compiler doesn't supply a working version of std::regex (for example gcc 4.8.x)

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

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