viktorljung ce27b224df Merge remote-tracking branch 'origin/master' into TextRendering ...

# Conflicts:
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/RenderSystem.cpp

2016-01-19 17:27:09 +01:00

..

Engine

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

2016-01-19 17:27:09 +01:00

Game

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

2016-01-18 17:44:26 +01:00