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 /util-linux/rdate.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 'util-linux/rdate.c')
| -rw-r--r-- | util-linux/rdate.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/util-linux/rdate.c b/util-linux/rdate.c index 628df0da7..1f36d8f37 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | //usage: "[-sp] HOST" | 12 | //usage: "[-sp] HOST" |
| 13 | //usage:#define rdate_full_usage "\n\n" | 13 | //usage:#define rdate_full_usage "\n\n" |
| 14 | //usage: "Get and possibly set the system date and time from a remote HOST\n" | 14 | //usage: "Get and possibly set the system date and time from a remote HOST\n" |
| 15 | //usage: "\nOptions:" | ||
| 16 | //usage: "\n -s Set the system date and time (default)" | 15 | //usage: "\n -s Set the system date and time (default)" |
| 17 | //usage: "\n -p Print the date and time" | 16 | //usage: "\n -p Print the date and time" |
| 18 | 17 | ||