Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6340 in orxonox.OLD for branches/network_merged/src/defs/class_id.h


Ignore:
Timestamp:
Dec 30, 2005, 1:52:26 AM (20 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/defs/class_id.h

    r6287 r6340  
    253253  CL_CONNECTION_MONITOR         =    0x00000b05,
    254254  CL_HANDSHAKE                  =    0x00000b06,
    255   CL_ENTITY_MANAGER             =    0x00000b07,
     255  CL_NETWORK_GAME_MANAGER       =    0x00000b07,
    256256
    257257
Note: See TracChangeset for help on using the changeset viewer.