Changeset cf5e86e in mainline for uspace/app/tester/tester.c

Timestamp:

2011-06-01T17:48:03Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

18626b3

Parents:

9bd5746 (diff), 5d1b3aa (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/tester.c (modified) (1 diff)

uspace/app/tester/tester.c

@@ -63 +63 @@
 #include "mm/malloc1.def"
 #include "mm/malloc2.def"
+#include "mm/malloc3.def"
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"
 #include "libext2/libext2_1.def"
 #include "devs/devman1.def"
+#include "devs/devman2.def"
         {NULL, NULL, NULL, false}
 };