OSDN Git Service

Merge 1.16.1 remote branch 'remotes/busybox/1_16_stable'
authorDylan Simon <dylan@dylex.net>
Mon, 29 Mar 2010 02:37:51 +0000 (22:37 -0400)
committerSteve Kondik <shade@chemlab.org>
Mon, 29 Mar 2010 03:49:01 +0000 (23:49 -0400)
commitf1200f1fd095caf5b04afc864346ec8644b6ee13
tree98cd03fa48f116f83d1b7e392a63f4c23198ff5b
parentd29f4039c457c9d07b756dda9e52329fe6b2dfa9
Merge 1.16.1 remote branch 'remotes/busybox/1_16_stable'

Conflicts:
Makefile
editors/diff.c
include-full/applet_tables.h
include-full/autoconf.h
include-full/usage_compressed.h
include-minimal/applet_tables.h
include-minimal/autoconf.h
include-minimal/usage_compressed.h