diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 14:04:58 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 14:04:58 +1000 |
| commit | f28d4b20905b5b1f52ffa52060a0c6caf4b055ba (patch) | |
| tree | 26196b8132f10ca96ac52d4aedc155138b475118 /libbb/Kbuild.src | |
| parent | 0c9d2455301ed633826e222aacd930126990913e (diff) | |
| parent | 0004e994934374b5695e004bbcb7b1fd67a170f2 (diff) | |
| download | busybox-w32-f28d4b20905b5b1f52ffa52060a0c6caf4b055ba.tar.gz busybox-w32-f28d4b20905b5b1f52ffa52060a0c6caf4b055ba.tar.bz2 busybox-w32-f28d4b20905b5b1f52ffa52060a0c6caf4b055ba.zip | |
Merge branch 'origin/master' (early part)
Conflicts:
include/libbb.h
libbb/messages.c
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 4fbf486b5..f30fa4818 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
| @@ -57,7 +57,6 @@ lib-y += md5.o | |||
| 57 | #lib-y += md5prime.o | 57 | #lib-y += md5prime.o |
| 58 | lib-y += messages.o | 58 | lib-y += messages.o |
| 59 | lib-y += mode_string.o | 59 | lib-y += mode_string.o |
| 60 | lib-y += mtab_file.o | ||
| 61 | lib-y += obscure.o | 60 | lib-y += obscure.o |
| 62 | lib-y += parse_mode.o | 61 | lib-y += parse_mode.o |
| 63 | lib-y += parse_config.o | 62 | lib-y += parse_config.o |