Lynix 5888949bf9 Fix merge files ...

Former-commit-id: 27058f380928319efcdd7af6104a776296b2093e

2015-08-21 22:43:53 +02:00

..

Audio

Separate NAZARA_API into multiple defines (one per module)

2015-06-13 22:31:29 +02:00

Core

Fix merge files

2015-08-21 22:43:53 +02:00

Graphics

Graphics: Improve code

2015-08-16 01:44:17 +02:00

Lua

Final VS fixes

2015-06-14 16:18:37 +02:00

Math

Merge branch 'master' into NDK

2015-08-21 18:55:58 +02:00

Noise

Separate NAZARA_API into multiple defines (one per module)

2015-06-13 22:31:29 +02:00

Physics

Separate NAZARA_API into multiple defines (one per module)

2015-06-13 22:31:29 +02:00

Renderer

Merge branch 'master' into NDK

2015-08-21 18:55:58 +02:00

Utility

Utility/SimpleTextDrawer: Fix movement

2015-08-20 00:00:16 +02:00

Audio.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Core.hpp

Merge branch 'master' into NDK

2015-08-21 18:55:58 +02: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

Regenerate global headers

2015-06-24 13:56:18 +02:00

Lua.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Math.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Noise.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Physics.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Prerequesites.hpp

Fix merge files

2015-08-21 22:43:53 +02:00

Renderer.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00

Utility.hpp

Regenerate global headers

2015-06-24 13:56:18 +02:00