Ignore:
Timestamp:
2010-03-15T19:35:25Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6092b56e
Parents:
92307f1 (diff), 4684368 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from bzr://bzr.helenos.org/head.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/include/ethernet_lsap.h

    r92307f1 r858fc90  
    7272 */
    7373#define ETH_LSAP_SNA2   0x0C
    74 /** PROWAY (IEC955) Network Management & Initialization LSAP identifier.
     74/** PROWAY (IEC955) Network Management &Initialization LSAP identifier.
    7575 */
    7676#define ETH_LSAP_PROWAY_NMI     0x0E
Note: See TracChangeset for help on using the changeset viewer.