Changeset 9869 in orxonox.OLD for trunk/src/lib/network/proxy/network_settings.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

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

trunk/src/lib/network/proxy/network_settings.h

@@ -24 +24 @@
 class NetworkSettings : public BaseObject
 {
-
+  ObjectListDeclaration(NetworkSettings);
   public:
     inline static NetworkSettings* getInstance() { if (!NetworkSettings::singletonRef) NetworkSettings::singletonRef = new NetworkSettings();