Changeset 10497 for code/branches/presentationFS15/src/libraries/network/MasterServer.h

Timestamp:

May 27, 2015, 10:45:56 AM (9 years ago)

Author:

maxima

Message:

multiplayer branch merged to presentation

File:

• code/branches/presentationFS15/src/libraries/network/MasterServer.h (modified) (2 diffs)

code/branches/presentationFS15/src/libraries/network/MasterServer.h

@@ -49 +49 @@
 #include <cstdio>
 
-namespace orxonox 
+#include <OgreStringConverter.h>
+
+
+namespace orxonox
 {
   /* singleton */
@@ -63 +66 @@
       /* static pointer for commands */
       static MasterServer *instance;
-      static MasterServer *getInstance() 
+      static MasterServer *getInstance()
         { return instance; }
-      static void setInstance( MasterServer *setto ) 
+      static void setInstance( MasterServer *setto )
         { instance = setto;  }
-      
+
       /* functions for commands */
       static void listServers( void );