Changeset ae972834 in mainline for uspace/srv/net/net/net.h


Ignore:
Timestamp:
2010-10-08T21:47:40Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b278b4e
Parents:
c0e74b1 (diff), 368fb2c (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 lp:~jakub/helenos/net.

File:
1 edited

Legend:

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

    rc0e74b1 rae972834  
    4646#include <adt/measured_strings.h>
    4747#include <adt/module_map.h>
    48 #include <packet/packet.h>
     48#include <net/packet.h>
    4949
    5050/** @name Modules definitions
Note: See TracChangeset for help on using the changeset viewer.