Changeset 7aaed09 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-12-18T14:02:30Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c868e2d
Parents:
3b71e84d (diff), 1761268 (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 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r3b71e84d r7aaed09  
    6464        app/nettest1 \
    6565        app/nettest2 \
     66        app/nettest3 \
    6667        app/ping \
    6768        app/websrv \
    … …  
    118119        drv/bus/usb/vhc \
    119120        drv/nic/lo \
    120         drv/nic/ne2k
     121        drv/nic/ne2k \
     122        drv/nic/e1k
    121123
    122124ifeq ($(CONFIG_PCC),y)
Note: See TracChangeset for help on using the changeset viewer.