Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 30, 2005, 1:52:26 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/network_merged/src/lib/lang/base_object.h

    r6280 r6340  
    1515#define NULL     0    //!< NULL
    1616#endif
     17
     18#include "stdincl.h"
    1719
    1820class TiXmlElement;
     
    4547  bool operator==(ClassID classID) { return this->isA(classID); };
    4648
     49  int       writeState(const byte* data, int length, int sender);
     50  int       readState(byte* data, int maxLength );
    4751 protected:
    4852  void setClassID(ClassID classID, const char* className);
Note: See TracChangeset for help on using the changeset viewer.