Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.

2016-03-13 14:23:56 +01:00
parent 4f99f6ef74
commit ac20e41a5d
7 changed files with 30 additions and 15 deletions
@@ -1,5 +1,5 @@
-#ifndef Reset_h__
-#define Reset_h__
+#ifndef Events_Reset_h__
+#define Events_Reset_h__

 #include "Core/EventBroker.h"
 #include "Core/EntityWrapper.h"