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

2016-02-05 13:59:21 +01:00
parent 71a86cab11 ff26e1235c
commit e90f802d48
9 changed files with 157 additions and 14 deletions
@@ -21,4 +21,5 @@ private:

    EventRelay<PlayerMovementSystem, Events::PlayerSpawned> m_EPlayerSpawned;
    bool OnPlayerSpawned(Events::PlayerSpawned& e);
+
 };