NazaraEngine/src/Nazara
Lynix 0f7948ea4c Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK
Conflicts:
	include/Nazara/Graphics/SkeletalModel.hpp
	src/Nazara/Graphics/SkeletalModel.cpp

Former-commit-id: 7dba08bc594d501adbc5a81c4ec1a70021eaa5b6
2015-05-31 22:18:09 +02:00
..
Audio Fixed missing includes and warnings under VS 2015-02-21 15:04:07 +01:00
Core Merge pull request #35 from Gawaboumga/POSIX 2015-05-03 18:28:45 +02:00
Graphics Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK 2015-05-31 22:18:09 +02:00
Lua (LuaInstance) Fixed Call() not resetting time limiter clock 2015-03-28 14:45:21 +01:00
Noise Regenerated global headers (and updated copyright year, again) 2015-01-30 22:33:41 +01:00
Physics Physics/Geom: Fix compilation 2015-05-31 22:14:00 +02:00
Renderer Merge remote-tracking branch 'origin/master' into NDK 2015-05-19 01:06:56 +02:00
Utility Merge branch 'master' into NDK 2015-05-06 23:45:41 +02:00