Merge branch 'master' into OrderedSystemPipeline

# Conflicts: # src/Game/Game.cpp
2016-01-07 16:49:20 +01:00
parent 7fb71f17b2 0e0a361a38
commit beb0967c3b
14 changed files with 325 additions and 2 deletions
@@ -3,7 +3,7 @@
 BaseEventRelay::~BaseEventRelay()
 {
    if (m_Broker != nullptr) {
-        m_Broker->Unsubscribe(*this);
+		m_Broker->Unsubscribe(*this);
    }
 }