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
..
actions	Move all build files to build directory	2015-06-14 01:47:02 +02:00
features	Merge branch 'master' into NDK	2015-08-21 12:49:05 +02:00
modules	Merge branch 'master' into NDK	2015-09-20 23:41:21 +02:00
tools	UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")	2015-09-19 01:14:19 +02:00
common.lua	Build: Disable VS Minimal Rebuild (in order to enable /MP)	2015-09-19 13:38:30 +02:00