viktorljung ada1bac2a7 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/ForwardPlus.frag.glsl
#	src/Engine/Rendering/RenderSystem.cpp

2016-01-24 20:48:17 +01:00

..

Engine

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

2016-01-24 20:48:17 +01:00

Game

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

2016-01-24 20:48:17 +01:00