[asterisk-commits] trunk - r8123 in /trunk: ./ asterisk.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 17 07:13:31 2006
New Revision: 8123

URL: http://svn.digium.com/view/asterisk?rev=8123&view=rev
Log:
Merged revisions 8122 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r8122 | kpfleming | 2006-01-17 07:11:55 -0600 (Tue, 17 Jan 2006) | 2 lines

update CLI copyright notice

........

Modified:
    trunk/   (props changed)
    trunk/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: trunk/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/asterisk.c?rev=8123&r1=8122&r2=8123&view=diff
==============================================================================
--- trunk/asterisk.c (original)
+++ trunk/asterisk.c Tue Jan 17 07:13:31 2006
@@ -130,7 +130,7 @@
 
 /*! \brief Welcome message when starting a CLI interface */
 #define WELCOME_MESSAGE \
-	ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2005 Digium, Inc. and others.\n"); \
+	ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n"); \
 	ast_verbose("Created by Mark Spencer <markster at digium.com>\n"); \
 	ast_verbose("Asterisk comes with ABSOLUTELY NO WARRANTY; type 'show warranty' for details.\n"); \
 	ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \