Lynix 780da2cfa5 Resolved conflicts ...

Former-commit-id: 4bd4e4f8435d701d16d3864dd030a6c1cff48c47

2012-12-02 21:49:14 +01:00

..

Config.hpp

Normalized line ending

2012-09-21 14:24:48 +02:00

Context.hpp

Added missing include

2012-10-29 09:56:21 +01:00

ContextParameters.hpp

Changed all the files encoding to UTF-8

2012-08-10 03:21:37 +02:00

Debug.hpp

Changed all the files encoding to UTF-8

2012-08-10 03:21:37 +02:00

DebugDrawer.hpp

Big skeletal animation update

2012-11-21 19:20:32 +01:00

DebugOff.hpp

Changed all the files encoding to UTF-8

2012-08-10 03:21:37 +02:00

Enums.hpp

Resolved conflicts

2012-12-02 21:49:14 +01:00

Material.hpp

Resolved conflicts

2012-12-02 21:49:14 +01:00

OcclusionQuery.hpp

Changed all the files encoding to UTF-8

2012-08-10 03:21:37 +02:00

OpenGL.hpp

Big skeletal animation update

2012-11-21 19:20:32 +01:00

Renderer.hpp

Fixed repo

2012-11-29 10:15:10 +01:00

RenderTarget.hpp

Normalized line ending

2012-09-21 14:24:48 +02:00

RenderTargetParameters.hpp

Changed all the files encoding to UTF-8

2012-08-10 03:21:37 +02:00

RenderTexture.hpp

Normalized line ending

2012-09-21 14:24:48 +02:00

RenderWindow.hpp

Big skeletal animation update

2012-11-21 19:20:32 +01:00

Shader.hpp

Added Shader::SendColor(Color)

2012-11-08 14:25:48 +01:00

Texture.hpp

Resolved conflicts

2012-12-02 21:49:14 +01:00