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 /coreutils/install.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 'coreutils/install.c')
-rw-r--r-- | coreutils/install.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coreutils/install.c b/coreutils/install.c index fe5f26e79..445497f9a 100644 --- a/coreutils/install.c +++ b/coreutils/install.c | |||
@@ -11,7 +11,6 @@ | |||
11 | //usage: "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST" | 11 | //usage: "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST" |
12 | //usage:#define install_full_usage "\n\n" | 12 | //usage:#define install_full_usage "\n\n" |
13 | //usage: "Copy files and set attributes\n" | 13 | //usage: "Copy files and set attributes\n" |
14 | //usage: "\nOptions:" | ||
15 | //usage: "\n -c Just copy (default)" | 14 | //usage: "\n -c Just copy (default)" |
16 | //usage: "\n -d Create directories" | 15 | //usage: "\n -d Create directories" |
17 | //usage: "\n -D Create leading target directories" | 16 | //usage: "\n -D Create leading target directories" |