Lynix 505f1dbb03 Merge branch 'master' into NDK ...

Conflicts:
	include/Nazara/Core/Algorithm.inl
	include/Nazara/Core/ByteArray.hpp
	include/Nazara/Math/Algorithm.inl
	src/Nazara/Graphics/SkyboxBackground.cpp

Former-commit-id: 42f52f71989fa805f69527fd07edb8405df06566

2015-08-21 18:55:58 +02:00

..

bin/resources

Added Lua extern library

2013-04-12 16:51:04 +02:00

DopplerEffect

Final VS fixes

2015-06-14 16:18:37 +02:00

FirstScene

Merge remote-tracking branch 'origin/BuildSystem-Update' into NDK

2015-06-13 23:26:34 +02:00

HardwareInfo

Merge branch 'master' into NDK

2015-08-21 18:55:58 +02:00

MeshInfos

Final VS fixes

2015-06-14 16:18:37 +02:00