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 /libbb/appletlib.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 'libbb/appletlib.c')
| -rw-r--r-- | libbb/appletlib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index 76c4d8ff3..0c0d14499 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
| @@ -629,11 +629,11 @@ static int busybox_main(char **argv) | |||
| 629 | full_write2_str(bb_banner); /* reuse const string */ | 629 | full_write2_str(bb_banner); /* reuse const string */ |
| 630 | full_write2_str(" multi-call binary.\n"); /* reuse */ | 630 | full_write2_str(" multi-call binary.\n"); /* reuse */ |
| 631 | full_write2_str( | 631 | full_write2_str( |
| 632 | "Copyright (C) 1998-2011 Erik Andersen, Rob Landley, Denys Vlasenko\n" | 632 | "BusyBox is copyrighted by many authors between 1998-2012.\n" |
| 633 | "and others. Licensed under GPLv2.\n" | 633 | "Licensed under GPLv2. See source distribution for detailed\n" |
| 634 | "See source distribution for full notice.\n" | 634 | "copyright notices.\n" |
| 635 | "\n" | 635 | "\n" |
| 636 | "Usage: busybox [function] [arguments]...\n" | 636 | "Usage: busybox [function [arguments]...]\n" |
| 637 | " or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n" | 637 | " or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n" |
| 638 | IF_FEATURE_INSTALLER( | 638 | IF_FEATURE_INSTALLER( |
| 639 | " or: busybox --install [-s] [DIR]\n" | 639 | " or: busybox --install [-s] [DIR]\n" |