diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:50:21 +0700 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:50:21 +0700 |
commit | a0c649140c14dcf004f04737c4c3e438ca371c0a (patch) | |
tree | 4574de52920a54dca65e91b810a702bfffacd1aa /libbb/Kbuild.src | |
parent | 808c59093f66849fd65c283ec2f68745a98cd291 (diff) | |
parent | eb7fe6dbf5bc93a229379a8047539dd8b90e0974 (diff) | |
download | busybox-w32-a0c649140c14dcf004f04737c4c3e438ca371c0a.tar.gz busybox-w32-a0c649140c14dcf004f04737c4c3e438ca371c0a.tar.bz2 busybox-w32-a0c649140c14dcf004f04737c4c3e438ca371c0a.zip |
Merge commit 'eb7fe6dbf5bc93a229379a8047539dd8b90e0974'
Conflicts:
libbb/Kbuild.src
Diffstat (limited to 'libbb/Kbuild.src')
-rw-r--r-- | libbb/Kbuild.src | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index a0d7389e8..9597bcbd3 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -53,7 +53,6 @@ lib-y += last_char_is.o | |||
53 | lib-y += lineedit.o lineedit_ptr_hack.o | 53 | lib-y += lineedit.o lineedit_ptr_hack.o |
54 | lib-y += llist.o | 54 | lib-y += llist.o |
55 | lib-y += make_directory.o | 55 | lib-y += make_directory.o |
56 | lib-y += hash_md5.o | ||
57 | # Alternative (disabled) implementation | 56 | # Alternative (disabled) implementation |
58 | #lib-y += hash_md5prime.o | 57 | #lib-y += hash_md5prime.o |
59 | lib-y += hash_sha.o | 58 | lib-y += hash_sha.o |