Changeset ceafd1b in mainline for kernel/Makefile

Timestamp:

2012-07-16T15:32:42Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

01b8c2e4

Parents:

2e39656 (diff), f0348c8 (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:

• kernel/Makefile (modified) (1 diff)

kernel/Makefile

@@ -196 +196 @@
         generic/src/console/chardev.c \
         generic/src/console/console.c \
+        generic/src/console/prompt.c \
         generic/src/cpu/cpu.c \
         generic/src/ddi/ddi.c \