[Cvs-cvs] ccvs/src ChangeLog main.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/05/16 03:23:26

Modified files:
        src            : ChangeLog main.c 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3407&tr2=1.3408&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/main.c.diff?tr1=1.266&tr2=1.267&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3407 ccvs/src/ChangeLog:1.3408
--- ccvs/src/ChangeLog:1.3407   Tue May 16 01:30:34 2006
+++ ccvs/src/ChangeLog  Tue May 16 03:23:26 2006
@@ -1,5 +1,7 @@
 2006-05-16  Derek Price  <address@hidden>
 
+       * main.c: Update copyright for 2006.
+
        * admin.c (admin): Factor CVS_ADMIN_GROUP check to...
        * subr.c (is_admin): ...this new function.
        * subr.h (is_admin): Add proto/macro.
Index: ccvs/src/main.c
diff -u ccvs/src/main.c:1.266 ccvs/src/main.c:1.267
--- ccvs/src/main.c:1.266       Mon Apr 24 18:50:26 2006
+++ ccvs/src/main.c     Tue May 16 03:23:26 2006
@@ -881,7 +881,7 @@
                version (0, NULL);    
                (void) fputs ("\n", stdout);
                (void) fputs ("\
-Copyright (C) 2005 Free Software Foundation, Inc.\n\
+Copyright (C) 2006 Free Software Foundation, Inc.\n\
 \n\
 Senior active maintainers include Larry Jones, Derek R. Price,\n\
 and Mark D. Baushke.  Please see the AUTHORS and README files from the CVS\n\