Lynix b16abf0d09 Merge branch 'master' into NDK ... Conflicts: build/scripts/module/renderer.lua build/scripts/module/utility.lua include/Nazara/Renderer/OpenGL.hpp src/Nazara/Core/String.cpp Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f		2015-09-20 23:41:21 +02:00
..
Nazara	Merge branch 'master' into NDK	2015-09-20 23:41:21 +02:00