OSDN Git Service

Merge remote branch 'busybox/1_16_stable'
authorDylan Simon <dylan@dylex.net>
Sun, 7 Feb 2010 06:41:04 +0000 (01:41 -0500)
committerDylan Simon <dylan@dylex.net>
Sun, 7 Feb 2010 06:41:04 +0000 (01:41 -0500)
commitda799e5796aee298b96a10648344272788525741
tree34da1764a7797cf46ec1fb8240d796bbd10484bd
parent96a4d5bccdb6ec766e61f136ff49d9bf237e46d6
parente52b735231bda70d811e4f9ef0e21fb2c7af96a2
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:
.config
Android.mk
Makefile
archival/tar.c
busybox.links
coreutils/ls.c
coreutils/stat.c
findutils/find.c
include/applet_tables.h
include/autoconf.h
include/bbconfigopts.h
include/libbb.h
include/platform.h
include/usage_compressed.h
libbb/appletlib.c
modutils/Config.in
networking/ftpgetput.c
networking/ping.c
networking/telnet.c
shell/ash.c
util-linux/more.c
util-linux/swaponoff.c