Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 1d4262e in mainline for uspace/Makefile


Ignore:
Timestamp:
2012-04-20T08:08:25Z (10 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master
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
  • uspace/Makefile

    re6f6260 r1d4262e  
    7878        srv/net/ethip \
    7979        srv/net/inet \
     80        srv/net/loopip \
    8081        srv/net/tcp \
    8182        srv/net/udp \
     
    121122        drv/bus/usb/usbmid \
    122123        drv/bus/usb/vhc \
    123         drv/nic/lo \
    124124        drv/nic/ne2k \
    125125        drv/nic/e1k \
Note: See TracChangeset for help on using the changeset viewer.