William Moberg a3b3351e55 Merge branch 'master' into Dirtybit ...

# Conflicts:
#	include/Engine/Rendering/ExplosionEffectJob.h
#	src/Game/Systems/ExplosionEffectSystem.cpp

2016-03-12 17:59:50 +01:00

..

Engine

Merge branch 'master' into Dirtybit

2016-03-12 17:59:50 +01:00

Game

Merge branch 'master' into Dirtybit

2016-03-12 17:59:50 +01:00