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

# Conflicts: # src/Game/Game.cpp
2016-01-14 17:07:39 +01:00
parent 6ad1839def a8f7d5f6b9
commit 3a4f378ac5
44 changed files with 819 additions and 778 deletions
@@ -7,7 +7,6 @@
 #include "Core/ResourceManager.h"
 #include "Core/ConfigFile.h"
 #include "Rendering/Renderer.h"
-#include "Core/EntityXMLFile.h"
 #include "Engine\Rendering\Texture.h"

 BOOST_AUTO_TEST_SUITE(resourceManagerTests)