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:
@@ -1,5 +1,5 @@
|
||||
#ifndef RenderSystem_h__
|
||||
#define RenderSystem_h__
|
||||
#define RenderSystem_h__
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user