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

Conflicts: src/game/Sound/SoundSystem.cpp
2015-10-16 11:53:38 +02:00
parent 64f903a6b6 f335955396
commit 0180b29544
31 changed files with 1460 additions and 57 deletions
@@ -8,6 +8,7 @@
 #include "Core/World.h"
 #include "Core/EventBroker.h"
 #include "Core/ResourceManager.h"
+#include "Core/ConfigFile.h"
 #include "Sound.h"
 #include "Sound/CCollisionSound.h"
 #include "Game/CBall.h"