diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /miscutils/strings.c | |
parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'miscutils/strings.c')
-rw-r--r-- | miscutils/strings.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/miscutils/strings.c b/miscutils/strings.c index 6e8b9aefc..9f5018244 100644 --- a/miscutils/strings.c +++ b/miscutils/strings.c | |||
@@ -11,7 +11,6 @@ | |||
11 | //usage: "[-afo] [-n LEN] [FILE]..." | 11 | //usage: "[-afo] [-n LEN] [FILE]..." |
12 | //usage:#define strings_full_usage "\n\n" | 12 | //usage:#define strings_full_usage "\n\n" |
13 | //usage: "Display printable strings in a binary file\n" | 13 | //usage: "Display printable strings in a binary file\n" |
14 | //usage: "\nOptions:" | ||
15 | //usage: "\n -a Scan whole file (default)" | 14 | //usage: "\n -a Scan whole file (default)" |
16 | //usage: "\n -f Precede strings with filenames" | 15 | //usage: "\n -f Precede strings with filenames" |
17 | //usage: "\n -n LEN At least LEN characters form a string (default 4)" | 16 | //usage: "\n -n LEN At least LEN characters form a string (default 4)" |