Changeset 27bdfa5 in mainline for kernel/Makefile

Timestamp:

2011-03-30T17:34:59Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

48d4231, 87b52c9, 98169ab, e353e85

Parents:

51e5608 (diff), 917a8c8 (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

@@ -240 +240 @@
         generic/src/lib/func.c \
         generic/src/lib/memstr.c \
+        generic/src/lib/memfnc.c \
         generic/src/lib/sort.c \
         generic/src/lib/str.c \