diff options
author | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:41:10 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:41:10 +0100 |
commit | d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e (patch) | |
tree | 4b364ba4b6b9e96c2629fe382fef0248d76833dd /libbb/Kbuild.src | |
parent | 7905d97aeece18da362a5a1e066abff2d2e5c16b (diff) | |
parent | d257608a8429b64e1a04c7cb6d99975eeb2c3955 (diff) | |
download | busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.tar.gz busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.tar.bz2 busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.zip |
Merge branch 'busybox' into merge
Conflicts:
debianutils/which.c
editors/vi.c
libbb/executable.c
Diffstat (limited to 'libbb/Kbuild.src')
-rw-r--r-- | libbb/Kbuild.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index d81ae8468..107c80689 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -30,7 +30,7 @@ lib-y += crc32.o | |||
30 | lib-y += default_error_retval.o | 30 | lib-y += default_error_retval.o |
31 | lib-y += device_open.o | 31 | lib-y += device_open.o |
32 | lib-y += dump.o | 32 | lib-y += dump.o |
33 | lib-y += execable.o | 33 | lib-y += executable.o |
34 | lib-y += fclose_nonstdin.o | 34 | lib-y += fclose_nonstdin.o |
35 | lib-y += fflush_stdout_and_exit.o | 35 | lib-y += fflush_stdout_and_exit.o |
36 | lib-y += fgets_str.o | 36 | lib-y += fgets_str.o |