Lynix 70ea6912e1 Merge branch 'OpenGL3-upgrade' into NDK ... Conflicts: src/Nazara/Graphics/SkyboxBackground.cpp src/Nazara/Renderer/RenderTexture.cpp src/Nazara/Renderer/Renderer.cpp Former-commit-id: e8914d4e32a689b7df365dca15a438f10722530c		2015-09-24 21:35:43 +02:00
..
Nazara	Merge branch 'OpenGL3-upgrade' into NDK	2015-09-24 21:35:43 +02:00