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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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

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