Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/Renderer.cpp
	Escape-the-Dawn/Systems/RenderSystem.cpp
This commit is contained in:
Tobias Dahl
2014-03-12 15:34:25 +01:00
7 changed files with 25 additions and 467 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
#ifndef RenderSystem_h__
#define RenderSystem_h__
#define RenderSystem_h__
#include <unordered_map>