Changeset 7256 in orxonox.OLD for trunk/src/lib/network/network_manager.h

Timestamp:

Mar 30, 2006, 11:45:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the preferences back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/preferences . -r7233:HEAD
no conflicts… nice work

File:

• trunk/src/lib/network/network_manager.h (modified) (1 diff)

trunk/src/lib/network/network_manager.h

@@ -36 +36 @@
     void shutdown();
 
-    int establishConnection(const char* name, unsigned int port);
+    int establishConnection( const std::string & name, unsigned int port);
     int createServer(unsigned int port);