Jace 40718407ac Merge remote-tracking branch 'origin/master' into gui ...

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

2014-05-19 21:51:25 +02:00

..

EntityWrapper.h

WIP ECS GUI

2014-05-12 22:33:59 +02:00

Returngeance.vcxproj

Merge remote-tracking branch 'origin/master' into gui

2014-05-19 21:51:25 +02:00

Returngeance.vcxproj.filters

Merge remote-tracking branch 'origin/master' into gui

2014-05-19 21:51:25 +02:00