Changeset 544a2e4 in mainline for uspace/app/tester/Makefile

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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 mainline changes.

File:

• uspace/app/tester/Makefile (modified) (1 diff)

uspace/app/tester/Makefile

@@ -48 +48 @@
         ipc/ping_pong.c \
         loop/loop1.c \
+        mm/common.c \
         mm/malloc1.c \
+        mm/malloc2.c \
+        mm/malloc3.c \
         devs/devman1.c \
         hw/misc/virtchar1.c \