Jace 6684aa06b7 Merge branch 'master' into gui ...

Conflicts:
	src/GUI/Frame.h
	src/InputManager.cpp

2014-05-15 21:16:43 +02:00

..

EntityWrapper.h

WIP ECS GUI

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

Returngeance.vcxproj

Merge remote-tracking branch 'origin/deffered_rendering'

2014-05-13 04:07:24 +02:00

Returngeance.vcxproj.filters

Merge remote-tracking branch 'origin/deffered_rendering'

2014-05-13 04:07:24 +02:00