Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/network/monitor/network_monitor.cc

    r9656 r9869  
    3737SHELL_COMMAND(debug, NetworkMonitor, debug);
    3838
     39ObjectListDefinition(NetworkMonitor);
    3940
    4041
     
    4546  : Synchronizeable()
    4647{
    47   this->setClassID(CL_NETWORK_MONITOR, "NetworkMonitor");
     48  this->registerObject(this, NetworkMonitor::_objectList);
    4849
    4950  this->networkStream = networkStream;
Note: See TracChangeset for help on using the changeset viewer.