NazaraEngine/include
Lynix 0cb4726bf5 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: f62e9a27427d96893acd2381bb06ae928a1d3741
2015-06-29 21:05:09 +02:00
..
Nazara Merge remote-tracking branch 'origin/NDK' into NDK-ShadowMapping 2015-06-29 21:05:09 +02:00