viktorljung 405002777c Merge remote-tracking branch 'origin/EditorUsefulness' into Animations ...

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/FastWorld.xml
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Game.cpp

2016-01-27 17:16:49 +01:00

..

Engine

Merge remote-tracking branch 'origin/EditorUsefulness' into Animations

2016-01-27 17:16:49 +01:00

Game

Merge branch 'Cleanup'

2016-01-27 13:44:15 +01:00