diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
| commit | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (patch) | |
| tree | ea5dc2d28d15da0de25c197ed7d059c3656af1a0 /libbb/appletlib.c | |
| parent | 1118c95535ea51961437089fc3dece5ab4ea7e1b (diff) | |
| parent | d84b175cb6948eb17f847313bf912174e2f934e1 (diff) | |
| download | busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.gz busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.bz2 busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.zip | |
Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge
Conflicts:
include/platform.h
Diffstat (limited to 'libbb/appletlib.c')
| -rw-r--r-- | libbb/appletlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/appletlib.c b/libbb/appletlib.c index b824b4775..6d002b0dd 100644 --- a/libbb/appletlib.c +++ b/libbb/appletlib.c | |||
| @@ -627,7 +627,7 @@ static int busybox_main(char **argv) | |||
| 627 | full_write2_str(bb_banner); /* reuse const string */ | 627 | full_write2_str(bb_banner); /* reuse const string */ |
| 628 | full_write2_str(" multi-call binary.\n"); /* reuse */ | 628 | full_write2_str(" multi-call binary.\n"); /* reuse */ |
| 629 | full_write2_str( | 629 | full_write2_str( |
| 630 | "Copyright (C) 1998-2009 Erik Andersen, Rob Landley, Denys Vlasenko\n" | 630 | "Copyright (C) 1998-2011 Erik Andersen, Rob Landley, Denys Vlasenko\n" |
| 631 | "and others. Licensed under GPLv2.\n" | 631 | "and others. Licensed under GPLv2.\n" |
| 632 | "See source distribution for full notice.\n" | 632 | "See source distribution for full notice.\n" |
| 633 | "\n" | 633 | "\n" |