Changeset d1e580a in mainline for uspace/Makefile


Ignore:
Timestamp:
2012-07-29T03:07:52Z (12 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
10334c2e
Parents:
d7c8e39f (diff), b2ba418 (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

    rd7c8e39f rd1e580a  
    4848        app/klog \
    4949        app/loc \
    50         app/lsusb \
    5150        app/mkfat \
    5251        app/mkexfat \
    … …  
    172171        DIRS += \
    173172                drv/infrastructure/rootmac \
     173                drv/bus/pci/pciintel \
    174174                srv/hw/bus/cuda_adb
    175175endif
Note: See TracChangeset for help on using the changeset viewer.