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

# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Rendering/Renderer.cpp

2016-01-06 11:35:55 +01:00

..

Engine

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

2016-01-06 11:35:55 +01:00

Game

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

2015-12-18 14:18:53 +01:00