BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sippeangelo
2015-12-04 09:46:30 +01:00
parent 25258f7e78 175762777d
commit 7f88a8b2d2
22 changed files with 937 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Game.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "Core/ResourceManager.h"
#include "Core/ConfigFile.h"
#include "Core/EventBroker.h"
#include "Rendering/DummyRenderer.h"
#include "Rendering/Renderer.h"
#include "Core/InputManager.h"
#include "GUI/Frame.h"
#include "Core/World.h"