Jace 62abb3f964 Merge branch 'havok' ...

Conflicts:
	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/RenderSystem.cpp
	src/Systems/RenderSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters

2014-04-16 00:38:30 +02:00

..

ModelingProject1

Changed toolset to vs11, for future Havok implementation.

2014-04-12 01:59:55 +02:00

Returngeance

Merge branch 'havok'

2014-04-16 00:38:30 +02:00

Returngeance.sln

Changed toolset to vs11, for future Havok implementation.

2014-04-12 01:59:55 +02:00