diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-05 17:10:11 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-05 17:10:11 +0000 |
commit | 35beb4d8d25348e87125ed78286645407135ec2a (patch) | |
tree | 655398adaec8467674b30f6f43c2c5c55fa0d34c | |
parent | 36c70802581bd2c0cc6aaf5111f689a866c40e31 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@244928 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/asterisk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 0859257f8..0001cd546 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 <markster@digium.com>\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"); |