Ignore:
Timestamp:
2010-04-04T21:41:47Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5db9084
Parents:
36a75a2 (diff), ee7e82a9 (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 mainline changes.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/socket/include/net_messages.h

    r36a75a2 r59ecd4a  
    4343#include <ipc/services.h>
    4444
    45 #include "include/device.h"
    46 
    47 #include "structures/measured_strings.h"
    48 #include "structures/packet/packet.h"
     45#include <net_device.h>
     46#include <adt/measured_strings.h>
     47#include <packet/packet.h>
    4948
    5049/** Returns a value indicating whether the value is in the interval.
Note: See TracChangeset for help on using the changeset viewer.