Changeset 7739 for code/branches/presentation/src/libraries/network/WANDiscovery.h

Timestamp:

Dec 8, 2010, 4:25:52 PM (13 years ago)

Author:

dafrick

Message:

Merging masterserver branch to new presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/libraries/network/WANDiscovery.h (copied) (copied from code/branches/masterserver/src/libraries/network/WANDiscovery.h) (1 diff)

code/branches/presentation/src/libraries/network/WANDiscovery.h

@@ -100 +100 @@
 
       /** master server address */
-      std::string msaddr;
+      std::string msaddress;
 
   }; // tolua_export