Lynix 446f537e3f Merge branch 'master' into NDK ...

Conflicts:
	src/Nazara/Physics/Geom.cpp

Former-commit-id: 8fd71e34dbe105890042acc55e30b64e7c457ed4

2015-05-06 23:45:41 +02:00

..

Audio

(sndfile loader) Removed useless allocation when mixing to mono

2015-02-08 14:35:27 +01:00

Core

Merge branch 'master' into NDK

2015-05-06 23:45:41 +02:00

Graphics

Alphabetical commit

2015-03-19 18:17:52 +01:00

Lua

(LuaInstance) Fixed Call() not resetting time limiter clock

2015-03-28 14:45:21 +01:00

Math

Merge branch 'master' into NDK

2015-05-06 23:45:41 +02:00

Noise

Updated copyright year

2015-01-21 20:53:01 +01:00

Physics

Merge branch 'master' into NDK

2015-05-06 23:45:41 +02:00

Renderer

Merge branch 'master' into NDK

2015-05-06 23:45:41 +02:00

Utility

Merge branch 'master' into NDK

2015-05-06 23:45:41 +02:00

Audio.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00

Core.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00

Debug.hpp

Regenerated global headers (and updated copyright year, again)

2015-01-30 22:33:41 +01:00

DebugOff.hpp

Regenerated global headers (and updated copyright year, again)

2015-01-30 22:33:41 +01:00

Graphics.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00

Lua.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00

Math.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00

Noise.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00

Physics.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00

Prerequesites.hpp

Added more 64bits defines

2015-02-24 17:28:30 +01:00

Renderer.hpp

Fixed global header

2015-04-14 13:46:56 +02:00

Utility.hpp

Merge branch 'master' into NDK

2015-03-19 13:13:20 +01:00