Changeset 818dc00 in mainline for boot/Makefile.common

Timestamp:

2010-12-09T00:02:25Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

040068c

Parents:

aca85e4 (diff), 07b9203e (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 vojtechhorky/

File:

• boot/Makefile.common (modified) (1 diff)

boot/Makefile.common

@@ -142 +142 @@
         $(USPACE_PATH)/app/ping/ping \
         $(USPACE_PATH)/app/stats/stats \
-        $(USPACE_PATH)/app/virtusbkbd/vuk \
         $(USPACE_PATH)/app/tasks/tasks \
-        $(USPACE_PATH)/app/top/top
+        $(USPACE_PATH)/app/top/top \
+        $(USPACE_PATH)/app/usbinfo/usbinfo \
+        $(USPACE_PATH)/app/virtusbkbd/vuk
 
 ifneq ($(CONFIG_BAREBONE),y)