Changeset 1866945 in mainline for boot/Makefile.common


Ignore:
Timestamp:
2011-05-07T13:47:48Z (13 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4d20ef7
Parents:
95285378 (diff), 6fb003e (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 usb/development

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r95285378 r1866945  
    140140        $(USPACE_PATH)/app/stats/stats \
    141141        $(USPACE_PATH)/app/sysinfo/sysinfo \
    142         $(USPACE_PATH)/app/tasks/tasks \
    143142        $(USPACE_PATH)/app/top/top \
    144143        $(USPACE_PATH)/app/usbinfo/usbinfo \
    145         $(USPACE_PATH)/app/virtusbkbd/vuk \
    146144        $(USPACE_PATH)/app/vuhid/vuh \
    147145        $(USPACE_PATH)/app/websrv/websrv
Note: See TracChangeset for help on using the changeset viewer.