Changeset b39eb79 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-12-26T17:21:21Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b56a8dd
Parents:
cf5c05c0 (diff), 7e1b130 (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:

Mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    rcf5c05c0 rb39eb79  
    6464        app/nettest1 \
    6565        app/nettest2 \
     66        app/nettest3 \
    6667        app/ping \
    6768        app/websrv \
     
    121122        drv/bus/usb/vhc \
    122123        drv/nic/lo \
    123         drv/nic/ne2k
     124        drv/nic/ne2k \
     125        drv/nic/e1k
    124126
    125127ifeq ($(CONFIG_PCC),y)
Note: See TracChangeset for help on using the changeset viewer.