Merge remote-tracking branch 'origin' into Tobias

2015-10-19 15:57:41 +02:00
parent 7b428f2b54 3f2a1c8d90
commit c1df5d69a9
13 changed files with 49 additions and 10 deletions
@@ -5,6 +5,8 @@
 #ifndef DAYDREAM_LIFEBUOYSYSTEM_H
 #define DAYDREAM_LIFEBUOYSYSTEM_H

+#include <fstream>
+#include <iostream>
 #include "Core/System.h"
 #include "Core/CTransform.h"
 #include "Core/CTemplate.h"
@@ -19,8 +21,7 @@
 #include "Game/ELifebuoy.h"
 #include "Game/ELifebuoyHit.h"
 #include "Game/CLifebuoy.h"
-#include <fstream>
-#include <iostream>
+#include "Physics/ECreateParticleSequence.h"

 namespace dd
 {