Changeset db71e2a in mainline for uspace/srv/net/inetsrv/Makefile


Ignore:
Timestamp:
2013-07-24T17:42:25Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
69b264a9
Parents:
52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/inetsrv/Makefile

    r52f1882 rdb71e2a  
    3333        addrobj.c \
    3434        icmp.c \
     35        icmpv6.c \
    3536        inetsrv.c \
    3637        inet_link.c \
    37         inet_util.c \
    3838        inetcfg.c \
    3939        inetping.c \
     40        inetping6.c \
     41        ndp.c \
     42        ntrans.c \
    4043        pdu.c \
    4144        reass.c \
Note: See TracChangeset for help on using the changeset viewer.