Lynix ea3fdaba26 Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping ... Conflicts: SDK/include/NDK/Systems/RenderSystem.hpp SDK/src/NDK/Systems/RenderSystem.cpp Former-commit-id: 0a72e838de272bff91f0b8c8a3637db94fdd7820		2015-06-22 13:31:23 +02:00
..
NDK	Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping	2015-06-22 13:31:23 +02:00