diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
| commit | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (patch) | |
| tree | 868c266e627e2d7f65ba5a4d5f98a1c421453181 /coreutils/Config.src | |
| parent | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (diff) | |
| parent | da4441c44f6efccb6f7b7588404d9c6bfb7b6af8 (diff) | |
| download | busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.gz busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.bz2 busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.zip | |
Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge
Conflicts:
libbb/vfork_daemon_rexec.c
networking/wget.c
procps/ps.c
Diffstat (limited to 'coreutils/Config.src')
| -rw-r--r-- | coreutils/Config.src | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index b599f7999..6297f43a3 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src | |||
| @@ -295,11 +295,11 @@ config FEATURE_INSTALL_LONG_OPTIONS | |||
| 295 | help | 295 | help |
| 296 | Support long options for the install applet. | 296 | Support long options for the install applet. |
| 297 | 297 | ||
| 298 | config LENGTH | 298 | ####config LENGTH |
| 299 | bool "length" | 299 | #### bool "length" |
| 300 | default y | 300 | #### default y |
| 301 | help | 301 | #### help |
| 302 | length is used to print out the length of a specified string. | 302 | #### length is used to print out the length of a specified string. |
| 303 | 303 | ||
| 304 | config LN | 304 | config LN |
| 305 | bool "ln" | 305 | bool "ln" |