Changeset 1d4262e in mainline for boot/Makefile.common


Ignore:
Timestamp:
2012-04-20T08:08:25Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
dfac604
Parents:
e6f6260 (diff), 606c369 (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    re6f6260 r1d4262e  
    112112        $(USPACE_PATH)/srv/net/ethip/ethip \
    113113        $(USPACE_PATH)/srv/net/inet/inet \
     114        $(USPACE_PATH)/srv/net/loopip/loopip \
    114115        $(USPACE_PATH)/srv/net/tcp/tcp \
    115116        $(USPACE_PATH)/srv/net/udp/udp \
    … …  
    123124        test/test2 \
    124125        test/test3 \
    125         nic/lo \
    126126        nic/ne2k \
    127127        nic/e1k \
Note: See TracChangeset for help on using the changeset viewer.