NazaraEngine/SDK
Lynix 025d873228 Merge branch 'NDK' into NDK-ShadowMapping
Conflicts:
	SDK/include/NDK/Systems/RenderSystem.hpp
	SDK/src/NDK/Systems/RenderSystem.cpp

Former-commit-id: 2772ff703c9d68d536667c469aca85084be4b861
2015-09-19 14:47:02 +02:00
..
include/NDK Merge branch 'NDK' into NDK-ShadowMapping 2015-09-19 14:47:02 +02:00
src/NDK Merge branch 'NDK' into NDK-ShadowMapping 2015-09-19 14:47:02 +02:00