Tleety d38f58165f Merge remote-tracking branch 'origin/master' into Forward+ ...

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

2015-12-18 15:27:47 +01:00

..

Engine

Merge remote-tracking branch 'origin/master' into Forward+

2015-12-18 15:27:47 +01:00

Game

Added EditorSystem

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