Changeset cc5908e in mainline for boot/Makefile.common

Timestamp:

2011-05-07T14:28:51Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

252cf2a, 68b614e

Parents:

bd2394b (diff), 7205209 (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:

Development changes merged

File:

• boot/Makefile.common (modified) (2 diffs)

boot/Makefile.common

@@ -128 +128 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \
         $(USPACE_PATH)/app/redir/redir \
@@ -140 +141 @@
         $(USPACE_PATH)/app/stats/stats \
         $(USPACE_PATH)/app/sysinfo/sysinfo \
-        $(USPACE_PATH)/app/tasks/tasks \
         $(USPACE_PATH)/app/top/top \
         $(USPACE_PATH)/app/usbinfo/usbinfo \
-        $(USPACE_PATH)/app/virtusbkbd/vuk \
         $(USPACE_PATH)/app/vuhid/vuh \
         $(USPACE_PATH)/app/websrv/websrv