Changeset ace12560 in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-02-20T21:52:43Z (14 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b317b0b, d37b235
Parents:
62066b4 (diff), 41e645c (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:

yet another merge with usb/development

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r62066b4 race12560  
    121121                drv/usbhid \
    122122                drv/usbhub \
     123                drv/usbmid \
    123124                drv/vhc
    124125endif
    … …  
    136137                drv/usbhid \
    137138                drv/usbhub \
     139                drv/usbmid \
    138140                drv/vhc
    139141endif
Note: See TracChangeset for help on using the changeset viewer.