Changeset 66be0288 in mainline for kernel/Makefile

Timestamp:

2014-01-17T17:02:59Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

476f62c, facc34d

Parents:

2e80321 (diff), 61b5b73d (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:

Mainline changes

File:

• kernel/Makefile (modified) (1 diff)

kernel/Makefile

@@ -212 +212 @@
         generic/src/debug/debug.c \
         generic/src/interrupt/interrupt.c \
+        generic/src/log/log.c \
         generic/src/main/main.c \
         generic/src/main/kinit.c \