diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /coreutils/uudecode.c | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'coreutils/uudecode.c')
| -rw-r--r-- | coreutils/uudecode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 0c4311f24..56ed254e5 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c | |||
| @@ -132,7 +132,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv) | |||
| 132 | } | 132 | } |
| 133 | #endif | 133 | #endif |
| 134 | 134 | ||
| 135 | //applet:IF_BASE64(APPLET(base64, _BB_DIR_BIN, _BB_SUID_DROP)) | 135 | //applet:IF_BASE64(APPLET(base64, BB_DIR_BIN, BB_SUID_DROP)) |
| 136 | 136 | ||
| 137 | //kbuild:lib-$(CONFIG_BASE64) += uudecode.o | 137 | //kbuild:lib-$(CONFIG_BASE64) += uudecode.o |
| 138 | 138 | ||