diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
| commit | fecf687cc358883de2da21de33346f0df204c80b (patch) | |
| tree | d22c606157926fb659374ae68d55e3a874bacf25 /coreutils/od_bloaty.c | |
| parent | b25a7c28a0f684087fa6ccbbc7e265a9cac0f0fa (diff) | |
| parent | 6d463de46b418e6c4c8d1397033608f78b33ab21 (diff) | |
| download | busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.gz busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.bz2 busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.zip | |
Merge branch 'busybox' into merge
Conflicts:
include/libbb.h
shell/ash.c
Diffstat (limited to 'coreutils/od_bloaty.c')
| -rw-r--r-- | coreutils/od_bloaty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index 8497722ba..7a6f22b03 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | //usage:#if ENABLE_DESKTOP | 26 | //usage:#if ENABLE_DESKTOP |
| 27 | //usage:#define od_trivial_usage | 27 | //usage:#define od_trivial_usage |
| 28 | //usage: "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE...]" | 28 | //usage: "[-abcdfhilovxs] [-t TYPE] [-A RADIX] [-N SIZE] [-j SKIP] [-S MINSTR] [-w WIDTH] [FILE]..." |
| 29 | // We don't support: | 29 | // We don't support: |
| 30 | // ... [FILE] [[+]OFFSET[.][b]] | 30 | // ... [FILE] [[+]OFFSET[.][b]] |
| 31 | // Support is buggy for: | 31 | // Support is buggy for: |