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/flashcp.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/flashcp.c')
| -rw-r--r-- | miscutils/flashcp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c index e4bb3a902..790f9c01f 100644 --- a/miscutils/flashcp.c +++ b/miscutils/flashcp.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | //usage: "-v FILE MTD_DEVICE" | 11 | //usage: "-v FILE MTD_DEVICE" |
| 12 | //usage:#define flashcp_full_usage "\n\n" | 12 | //usage:#define flashcp_full_usage "\n\n" |
| 13 | //usage: "Copy an image to MTD device\n" | 13 | //usage: "Copy an image to MTD device\n" |
| 14 | //usage: "\nOptions:" | ||
| 15 | //usage: "\n -v Verbose" | 14 | //usage: "\n -v Verbose" |
| 16 | 15 | ||
| 17 | #include "libbb.h" | 16 | #include "libbb.h" |