Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5599 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Nov 16, 2005, 2:45:51 PM (19 years ago)
Author:
bwuest
Message:

orxonox/network: network_protocol.h and network_protocol.cc created

Location:
branches/network
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/network/Makefile.am

    r5588 r5599  
    2828include doc/documentation.am
    2929endif
     30<<<<<<< .mine
     31_SOURCES = network_protocol.cc
     32=======
    3033_SOURCES = network_manager.cc
     34>>>>>>> .r5589

  • branches/network/src/lib/network/Makefile.am

    r5566 r5599  
    99                      connection_monitor.cc \
    1010                      network_stream.cc \
    11                       data_stream.cc
     11                      data_stream.cc \
     12                      network_protocol.cc
    1213
    1314
    … …  
    1819                 connection_monitor.h \
    1920                 network_stream.h \
    20                  data_stream.h
     21                 data_stream.h \
     22                 network_protocol.h
    2123
Note: See TracChangeset for help on using the changeset viewer.