Merge remote-tracking branch 'origin/master' into FriendlyHost/Join

2016-03-09 13:23:31 +01:00
parent c1f38a71ba 31ed606ef9
commit 67ccb5bee5
45 changed files with 10234 additions and 2437 deletions
@@ -0,0 +1,17 @@
+#ifndef Events_ConnectRequest_h__
+#define Events_ConnectRequest_h__
+
+#include "Core/EventBroker.h"
+
+namespace Events
+{
+
+struct ConnectRequest : public Event
+{
+    std::string IP = "";
+    int Port = 0;
+};
+
+}
+#endif
+