Changeset 88dea9d in mainline for boot/Makefile.common

Timestamp:

2010-04-17T16:28:49Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (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 from measuring branch

File:

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

boot/Makefile.common

@@ -92 +92 @@
         $(USPACEDIR)/app/nettest2/nettest2 \
         $(USPACEDIR)/app/netecho/netecho \
-        $(USPACEDIR)/app/ping/ping
+        $(USPACEDIR)/app/ping/ping \
+        $(USPACEDIR)/app/ps/ps \
+        $(USPACEDIR)/app/top/top \
+        $(USPACEDIR)/app/uptime/uptime \
+        $(USPACEDIR)/app/dummy_load/dummy_load
 
 COMPONENTS = \