Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.

2015-09-23 20:46:57 +02:00
parent bbec676683
commit 62b17e3dbf
13 changed files with 88 additions and 42 deletions
@@ -3,10 +3,11 @@

 #include "Core/System.h"
 #include "Core/World.h"
+#include "Core/EventBroker.h"
 #include "Core/CTransform.h"
 #include "Physics/EContact.h"
-#include "Core/EventBroker.h"
 #include "Game/CBall.h"
+#include "Game/CPowerUp.h"

 namespace dd {