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

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   06/06/22 18:18:22

Modified files:
        src            : ChangeLog mkmodules.c 

Log message:
        merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3453&r2=1.3454
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/mkmodules.c?cvsroot=cvs&r1=1.97&r2=1.98

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3453
retrieving revision 1.3454
diff -u -b -r1.3453 -r1.3454
--- ChangeLog   21 Jun 2006 18:55:21 -0000      1.3453
+++ ChangeLog   22 Jun 2006 18:18:22 -0000      1.3454
@@ -1,3 +1,7 @@
+2006-06-22  Larry Jones  <address@hidden>
+
+       * mkmodules.c (modules_contents): Remove defunct -i option.
+
 2006-06-21  Larry Jones  <address@hidden>
 
        * client.c: Remove unused global variable last_merge_no_change.

Index: mkmodules.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/mkmodules.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- mkmodules.c 24 Apr 2006 18:50:26 -0000      1.97
+++ mkmodules.c 22 Jun 2006 18:18:22 -0000      1.98
@@ -476,7 +476,6 @@
     "# key [options] directory files...\n",
     "#\n",
     "# Where \"options\" are composed of:\n",
-    "# -i prog         Run \"prog\" on \"cvs commit\" from top-level of 
module.\n",
     "# -o prog         Run \"prog\" on \"cvs checkout\" of module.\n",
     "# -e prog         Run \"prog\" on \"cvs export\" of module.\n",
     "# -t prog         Run \"prog\" on \"cvs rtag\" of module.\n",