Changeset 361e61b in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-03-21T14:23:15Z (13 years ago)
Author:
Matej Klonfar <maklf@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
55e388a1
Parents:
c32688d (diff), 48fe0c9 (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 development

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    rc32688d r361e61b  
    118118                srv/hw/irc/i8259 \
    119119                drv/ehci-hcd \
     120                drv/ohci \
    120121                drv/uhci-hcd \
    121122                drv/uhci-rhd \
     123                drv/usbflbk \
    122124                drv/usbhid \
    123125                drv/usbhub \
     
    136138                srv/hw/irc/i8259 \
    137139                drv/ehci-hcd \
     140                drv/ohci \
    138141                drv/uhci-hcd \
    139142                drv/uhci-rhd \
     143                drv/usbflbk \
    140144                drv/usbhid \
    141145                drv/usbhub \
Note: See TracChangeset for help on using the changeset viewer.