2 commits

Author	SHA1	Message	Date
Michaël Lemaire	9196be4c05	Merge branch 'master' into vegetation ... Conflicts: src/render/opengl/OpenGLShaderProgram.cpp src/render/opengl/OpenGLShaderProgram.h src/render/opengl/opengl_global.h	2015-12-08 01:28:15 +01:00
Michaël Lemaire	f242f55f81	Switched OpenGL to core profile	2015-12-07 23:32:55 +01:00