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

..

ByteArray.cpp

UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")

2015-09-19 01:14:19 +02:00

Clock.cpp

UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")

2015-09-19 01:14:19 +02:00

Color.cpp

UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")

2015-09-19 01:14:19 +02:00

Directory.cpp

UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")

2015-09-19 01:14:19 +02:00

Error.cpp

UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")

2015-09-19 01:14:19 +02:00

File.cpp

UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")

2015-09-19 01:14:19 +02:00

String.cpp

UnitTests: Add build script and move current tests to "tests/Engine" directory (from "tests/Nazara")

2015-09-19 01:14:19 +02:00

StringStream.cpp

Merge branch 'master' into NDK

2015-09-20 23:41:21 +02:00