Changeset 4fe3b6d in mainline for uspace/Makefile


Ignore:
Timestamp:
2011-05-20T11:07:00Z (13 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8bb61e6
Parents:
3476be8 (diff), 7941bd6 (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

    r3476be8 r4fe3b6d  
    5959        app/websrv \
    6060        app/sysinfo \
     61        app/mkbd \
    6162        srv/clip \
    6263        srv/devmap \
    … …  
    122123                drv/uhci-rhd \
    123124                drv/usbflbk \
    124                 drv/usbkbd \
    125125                drv/usbhid \
    126126                drv/usbhub \
    … …  
    144144                drv/uhci-rhd \
    145145                drv/usbflbk \
    146                 drv/usbkbd \
    147146                drv/usbhid \
    148147                drv/usbhub \
Note: See TracChangeset for help on using the changeset viewer.