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/coord/p_node.h

    r6142 r6340  
    2020
    2121#include "base_object.h"
     22#include "stdincl.h"
    2223
    2324#include "vector.h"
     
    178179  static PARENT_MODE charToParentingMode(const char* parentingMode);
    179180
     181  int       writeState(const byte* data, int length, int sender);
     182  int       readState(byte* data, int maxLength );
    180183
    181184 private:
Note: See TracChangeset for help on using the changeset viewer.