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

..

Config.hpp

Updated copyright year

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

ConfigCheck.hpp

Updated copyright year

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

Debug.hpp

Fixed some files encoding

2015-04-07 17:42:36 +02:00

DebugOff.hpp

Fixed some files encoding

2015-04-07 17:42:36 +02:00

Enums.hpp

Updated copyright year

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

Geom.hpp

Physics/Geom: Geoms no longer need a pointer to PhysWorld

2015-04-20 01:34:17 +02:00

Geom.inl

Physics/Geom: Improved Geom class

2015-04-19 18:01:45 +02:00

Physics.hpp

Fixed some files encoding

2015-04-07 17:42:36 +02:00

PhysObject.hpp

Physics/PhysObject: Fixed class being not copyable

2015-05-02 09:56:52 +02:00

PhysWorld.hpp

Updated copyright year

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