From: Sean Bright Date: Fri, 5 Feb 2010 17:10:11 +0000 (+0000) Subject: Merged revisions 244927 via svnmerge from X-Git-Tag: 1.6.0.23-rc2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2003431fdd7aa915de32a6f5fbbd873ec6352042;p=thirdparty%2Fasterisk.git Merged revisions 244927 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r244927 | seanbright | 2010-02-05 12:05:32 -0500 (Fri, 05 Feb 2010) | 9 lines Merged revisions 244926 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244926 | seanbright | 2010-02-05 12:03:35 -0500 (Fri, 05 Feb 2010) | 1 line Update main copyright date. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@244928 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/asterisk.c b/main/asterisk.c index 0859257f89..0001cd546a 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -137,7 +137,7 @@ int daemon(int, int); /* defined in libresolv of all places */ /*! \brief Welcome message when starting a CLI interface */ #define WELCOME_MESSAGE \ - ast_verbose("Asterisk %s, Copyright (C) 1999 - 2009 Digium, Inc. and others.\n" \ + ast_verbose("Asterisk %s, Copyright (C) 1999 - 2010 Digium, Inc. and others.\n" \ "Created by Mark Spencer \n" \ "Asterisk comes with ABSOLUTELY NO WARRANTY; type 'core show warranty' for details.\n" \ "This is free software, with components licensed under the GNU General Public\n" \ @@ -2589,7 +2589,7 @@ static int show_version(void) } static int show_cli_help(void) { - printf("Asterisk %s, Copyright (C) 1999 - 2009, Digium, Inc. and others.\n", ast_get_version()); + printf("Asterisk %s, Copyright (C) 1999 - 2010, Digium, Inc. and others.\n", ast_get_version()); printf("Usage: asterisk [OPTIONS]\n"); printf("Valid Options:\n"); printf(" -V Display version number and exit\n");