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
..
commandline	Made the vegetation impostors face the camera	2015-11-29 19:18:36 +01:00
modeler	Switched OpenGL to core profile	2015-12-07 23:32:55 +01:00