aboutsummaryrefslogtreecommitdiff
path: root/coreutils/uname.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
committerRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
commit1118c95535ea51961437089fc3dece5ab4ea7e1b (patch)
tree1515bd2376a6d6c5123791662307ce2ed90cdf36 /coreutils/uname.c
parent0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff)
parent066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff)
downloadbusybox-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/uname.c')
-rw-r--r--coreutils/uname.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 775c450df..3809835a4 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -52,7 +52,6 @@
52//usage: "[-amnrspv]" 52//usage: "[-amnrspv]"
53//usage:#define uname_full_usage "\n\n" 53//usage:#define uname_full_usage "\n\n"
54//usage: "Print system information\n" 54//usage: "Print system information\n"
55//usage: "\nOptions:"
56//usage: "\n -a Print all" 55//usage: "\n -a Print all"
57//usage: "\n -m The machine (hardware) type" 56//usage: "\n -m The machine (hardware) type"
58//usage: "\n -n Hostname" 57//usage: "\n -n Hostname"