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

# Conflicts:
#	include/Engine/Rendering/PickingPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp

2016-01-15 11:01:58 +01:00

..

Engine

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

2016-01-15 11:01:58 +01:00

Game

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

2016-01-12 16:13:20 +01:00