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/dos2unix.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/dos2unix.c')
| -rw-r--r-- | coreutils/dos2unix.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c index add1da666..e1fbe8538 100644 --- a/coreutils/dos2unix.c +++ b/coreutils/dos2unix.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | //usage:#define dos2unix_full_usage "\n\n" | 17 | //usage:#define dos2unix_full_usage "\n\n" |
| 18 | //usage: "Convert FILE in-place from DOS to Unix format.\n" | 18 | //usage: "Convert FILE in-place from DOS to Unix format.\n" |
| 19 | //usage: "When no file is given, use stdin/stdout.\n" | 19 | //usage: "When no file is given, use stdin/stdout.\n" |
| 20 | //usage: "\nOptions:" | ||
| 21 | //usage: "\n -u dos2unix" | 20 | //usage: "\n -u dos2unix" |
| 22 | //usage: "\n -d unix2dos" | 21 | //usage: "\n -d unix2dos" |
| 23 | //usage: | 22 | //usage: |
| @@ -26,7 +25,6 @@ | |||
| 26 | //usage:#define unix2dos_full_usage "\n\n" | 25 | //usage:#define unix2dos_full_usage "\n\n" |
| 27 | //usage: "Convert FILE in-place from Unix to DOS format.\n" | 26 | //usage: "Convert FILE in-place from Unix to DOS format.\n" |
| 28 | //usage: "When no file is given, use stdin/stdout.\n" | 27 | //usage: "When no file is given, use stdin/stdout.\n" |
| 29 | //usage: "\nOptions:" | ||
| 30 | //usage: "\n -u dos2unix" | 28 | //usage: "\n -u dos2unix" |
| 31 | //usage: "\n -d unix2dos" | 29 | //usage: "\n -d unix2dos" |
| 32 | 30 | ||