OSDN Git Service
Merge remote branch 'busybox/1_16_stable'
Fix compilation issues and update config only. BROKEN.
Conflicts:
Makefile
archival/cpio.c
archival/libunarchive/decompress_unlzma.c
archival/tar.c
coreutils/ls.c
coreutils/uniq.c
findutils/find.c
include/platform.h
libbb/lineedit.c
libbb/xfuncs_printf.c
miscutils/flash_eraseall.c
miscutils/time.c
networking/ftpgetput.c
shell/ash.c
shell/hush.c
shell/hush_test/hush-trap/subshell.right
shell/hush_test/hush-trap/subshell.tests
util-linux/more.c
util-linux/mount.c
22 files changed: