viktorljung ef07a9d536 Merge remote-tracking branch 'origin/master' into Rendering ...

# Conflicts:
#	include/Engine/Rendering/RenderQueueFactory.h

2015-12-14 19:11:00 +01:00

..

Engine

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

2015-12-14 19:11:00 +01:00

Game

Added EditorSystem

2015-12-14 13:57:51 +01:00