[SVN] r690 - in /branches/cvsmerge/cyrus-cvs: ./ CVS/ cmulocal/CVS/ contrib/CVS/ contrib/cyrus-graphtools.1.0/CVS/ contrib/cyrus-graphtools.1.0/cgi-bin/CVS/ contrib/cyrus-graphtools.1.0/html/CVS/ contrib/cyrus-graphtools.1.0/script/CVS/ contrib/notify_unix/CVS/ depot/CVS/ doc/CVS/ doc/internal/CVS/ doc/text/CVS/ et/CVS/ imap/CVS/ imtest/CVS/ installsieve/CVS/ lib/CVS/ lib/charset/CVS/ lib/test/CVS/ makedepend/CVS/ man/CVS/ master/CVS/ master/conf/CVS/ netnews/CVS/ notifyd/CVS/ perl/CVS/ perl/imap/CVS/ perl/imap/IMAP/CVS/ perl/imap/examples/CVS/ perl/imap/t/CVS/ perl/sieve/CVS/ perl/sieve/lib/CVS/ perl/sieve/managesieve/CVS/ perl/sieve/scripts/CVS/ ptclient/CVS/ sieve/CVS/ sieve/tests/CVS/ sieve/tests/action/CVS/ sieve/tests/action/serverm/CVS/ sieve/tests/action/testm/CVS/ sieve/tests/actionExtensions/CVS/ sieve/tests/actionExtensions/serverm/CVS/ sieve/tests/actionExtensions/testm/CVS/ sieve/tests/test/CVS/ sieve/tests/test/serverm/CVS/ sieve/tests/test/testm/CVS/ sieve/tests/testExtension/CVS/ sieve/tests/testExtension/serverm/CVS/ sieve/tests/testExtension/testm/CVS/ snmp/CVS/ syslog/CVS/ timsieved/CVS/ tools/CVS/

debian at incase.de debian at incase.de
Thu Nov 30 19:39:16 CET 2006


Author: sven
Date: Thu Nov 30 19:39:08 2006
New Revision: 690

URL: https://mail.incase.de/viewcvs?rev=690&root=cyrus22&view=rev
Log:
Reflect upstream move of the cyrus-2.3 branch to trunk, 2.2 branch to cyrus-imapd-2_2-tail branch

Added:
    branches/cvsmerge/cyrus-cvs/CVS/Tag
    branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Tag
    branches/cvsmerge/cyrus-cvs/contrib/CVS/Tag
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Tag
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Tag
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Tag
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Tag
    branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Tag
    branches/cvsmerge/cyrus-cvs/depot/CVS/Tag
    branches/cvsmerge/cyrus-cvs/doc/CVS/Tag
    branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Tag
    branches/cvsmerge/cyrus-cvs/doc/text/CVS/Tag
    branches/cvsmerge/cyrus-cvs/et/CVS/Tag
    branches/cvsmerge/cyrus-cvs/imap/CVS/Tag
    branches/cvsmerge/cyrus-cvs/imtest/CVS/Tag
    branches/cvsmerge/cyrus-cvs/installsieve/CVS/Tag
    branches/cvsmerge/cyrus-cvs/lib/CVS/Tag
    branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Tag
    branches/cvsmerge/cyrus-cvs/lib/test/CVS/Tag
    branches/cvsmerge/cyrus-cvs/makedepend/CVS/Tag
    branches/cvsmerge/cyrus-cvs/man/CVS/Tag
    branches/cvsmerge/cyrus-cvs/master/CVS/Tag
    branches/cvsmerge/cyrus-cvs/master/conf/CVS/Tag
    branches/cvsmerge/cyrus-cvs/netnews/CVS/Tag
    branches/cvsmerge/cyrus-cvs/notifyd/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Tag
    branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Tag
    branches/cvsmerge/cyrus-cvs/ptclient/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Tag
    branches/cvsmerge/cyrus-cvs/snmp/CVS/Tag
    branches/cvsmerge/cyrus-cvs/syslog/CVS/Tag
    branches/cvsmerge/cyrus-cvs/timsieved/CVS/Tag
    branches/cvsmerge/cyrus-cvs/tools/CVS/Tag
Modified:
    branches/cvsmerge/cyrus-cvs/CVS/Entries
    branches/cvsmerge/cyrus-cvs/Makefile.in
    branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries
    branches/cvsmerge/cyrus-cvs/contrib/CVS/Entries
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Entries
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Entries
    branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Entries
    branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Entries
    branches/cvsmerge/cyrus-cvs/depot/CVS/Entries
    branches/cvsmerge/cyrus-cvs/doc/CVS/Entries
    branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Entries
    branches/cvsmerge/cyrus-cvs/doc/text/CVS/Entries
    branches/cvsmerge/cyrus-cvs/et/CVS/Entries
    branches/cvsmerge/cyrus-cvs/imap/CVS/Entries
    branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries
    branches/cvsmerge/cyrus-cvs/installsieve/CVS/Entries
    branches/cvsmerge/cyrus-cvs/lib/CVS/Entries
    branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Entries
    branches/cvsmerge/cyrus-cvs/lib/test/CVS/Entries
    branches/cvsmerge/cyrus-cvs/makedepend/CVS/Entries
    branches/cvsmerge/cyrus-cvs/man/CVS/Entries
    branches/cvsmerge/cyrus-cvs/master/CVS/Entries
    branches/cvsmerge/cyrus-cvs/master/conf/CVS/Entries
    branches/cvsmerge/cyrus-cvs/netnews/CVS/Entries
    branches/cvsmerge/cyrus-cvs/notifyd/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Entries
    branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Entries
    branches/cvsmerge/cyrus-cvs/ptclient/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Entries
    branches/cvsmerge/cyrus-cvs/snmp/CVS/Entries
    branches/cvsmerge/cyrus-cvs/syslog/CVS/Entries
    branches/cvsmerge/cyrus-cvs/timsieved/CVS/Entries
    branches/cvsmerge/cyrus-cvs/tools/CVS/Entries

Modified: branches/cvsmerge/cyrus-cvs/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,10 +1,14 @@
-D/IMAP-Cyrus////
-D/SIEVE////
-D/SIEVE-Cyrus////
-D/amssync////
-D/cmulocal-old////
+/.cvsignore/1.2/Fri Oct  4 14:09:26 2002//Tcyrus-imapd-2_2-tail
+/COPYRIGHT/1.7/Thu Oct 12 20:45:21 2000//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.82.2.1/Thu Nov 30 17:16:28 2006//Tcyrus-imapd-2_2-tail
+/README/1.13/Wed Oct 22 18:50:01 2003//Tcyrus-imapd-2_2-tail
+/README.andrew/1.34/Thu Oct 13 19:53:04 2005//Tcyrus-imapd-2_2-tail
+/SMakefile/1.97/Fri Jan 20 20:26:46 2006//Tcyrus-imapd-2_2-tail
+/config.guess/1.1/Tue Apr 25 04:42:12 2000//Tcyrus-imapd-2_2-tail
+/config.sub/1.1/Tue Apr 25 04:42:12 2000//Tcyrus-imapd-2_2-tail
+/configure.in/1.296/Thu Oct 13 19:56:14 2005//Tcyrus-imapd-2_2-tail
+/install-sh/1.1/Fri Feb 10 19:26:06 1995//Tcyrus-imapd-2_2-tail
 D/contrib////
-D/cyradm////
 D/depot////
 D/doc////
 D/et////
@@ -19,21 +23,9 @@
 D/notifyd////
 D/perl////
 D/ptclient////
-D/pwcheck////
 D/snmp////
 D/syslog////
 D/timsieved////
 D/tools////
 D/cmulocal////
 D/sieve////
-D/acap////
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/COPYRIGHT/1.7/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.82/Wed May  3 15:43:58 2006//
-/README/1.13/Thu Feb  9 19:29:40 2006//
-/README.andrew/1.34/Thu Feb  9 19:29:40 2006//
-/SMakefile/1.97/Thu Feb  9 19:29:40 2006//
-/config.guess/1.1/Thu Feb  9 19:29:40 2006//
-/config.sub/1.1/Thu Feb  9 19:29:40 2006//
-/configure.in/1.296/Thu Feb  9 19:29:40 2006//
-/install-sh/1.1/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/Makefile.in?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/Makefile.in (original)
+++ branches/cvsmerge/cyrus-cvs/Makefile.in Thu Nov 30 19:39:08 2006
@@ -93,7 +93,7 @@
 	if [ \! -d dist ]; then mkdir dist ; fi
 	@echo "checking out the distribution"
 	@cd dist ; cvs -Q -d :pserver:anoncvs at cvs.andrew.cmu.edu:/cvs \
-		co -d cyrus-imapd-$(VERSION) cyrus
+		co -r cyrus-imapd-2_2-tail -d cyrus-imapd-$(VERSION) cyrus
 	touch distcvs
 
 install::

Modified: branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,48 +1,48 @@
-/COPYING/1.1/Thu Feb  9 19:29:40 2006//
-/README.andrew/1.11/Thu Feb  9 19:29:40 2006//
-/afs.m4/1.29/Thu Feb  9 19:29:40 2006//
-/agentx.m4/1.5/Thu Feb  9 19:29:40 2006//
-/arx.m4/1.6/Thu Feb  9 19:29:40 2006//
-/ax_path_bdb.m4/1.1/Thu Feb  9 19:29:40 2006//
-/berkdb.m4/1.20/Thu Feb  9 19:29:40 2006//
-/bsd_sockets.m4/1.10/Thu Feb  9 19:29:40 2006//
-/c-attribute.m4/1.3/Thu Feb  9 19:29:40 2006//
-/c-fpic.m4/1.2/Thu Feb  9 19:29:40 2006//
-/clamav.m4/1.2/Thu Feb  9 19:29:40 2006//
-/com_err.m4/1.6/Thu Feb  9 19:29:40 2006//
-/com_err_link.m4/1.9/Wed May  3 15:43:58 2006//
-/common.m4/1.13/Wed May  3 15:43:58 2006//
-/cyrus.m4/1.4/Thu Feb  9 19:29:40 2006//
-/db.m4/1.2/Thu Feb  9 19:29:40 2006//
-/find-func-no-libs.m4/1.2/Thu Feb  9 19:29:40 2006//
-/find-func-no-libs2.m4/1.2/Thu Feb  9 19:29:40 2006//
-/find-func.m4/1.2/Thu Feb  9 19:29:40 2006//
-/heimdal.m4/1.9/Thu Feb  9 19:29:40 2006//
-/init_automake.m4/1.4/Thu Feb  9 19:29:40 2006//
-/ipv6.m4/1.6/Thu Feb  9 19:29:40 2006//
-/kafs.m4/1.7/Thu Feb  9 19:29:40 2006//
-/kerberos_v4.m4/1.28/Thu Feb  9 19:29:40 2006//
-/kerberos_v5.m4/1.9/Thu Feb  9 19:29:40 2006//
-/libXau.m4/1.5/Thu Feb  9 19:29:40 2006//
-/libcyrus.m4/1.20/Thu Feb  9 19:29:40 2006//
-/libloguse.m4/1.7/Wed May  3 15:43:58 2006//
-/libnet.m4/1.8/Thu Feb  9 19:29:40 2006//
-/libpcap.m4/1.9/Thu Feb  9 19:29:40 2006//
-/librestrict.m4/1.6/Wed May  3 15:43:58 2006//
-/libssl.m4/1.10/Thu Feb  9 19:29:40 2006//
-/libtoolhack.m4/1.4/Thu Feb  9 19:29:40 2006//
-/libwrap.m4/1.10/Thu Feb  9 19:29:40 2006//
-/mips-abi.m4/1.5/Thu Feb  9 19:29:40 2006//
-/nadine.m4/1.6/Thu Feb  9 19:29:40 2006//
-/nana.m4/1.5/Thu Feb  9 19:29:40 2006//
-/openldap.m4/1.2/Wed May  3 15:43:58 2006//
-/openssl.m4/1.11/Wed May 17 19:04:35 2006//
-/pthreads.m4/1.11/Thu Feb  9 19:29:40 2006//
-/sasl.m4/1.23/Thu Feb  9 19:29:40 2006//
-/sasl2.m4/1.52/Fri May 19 13:58:18 2006//
-/tcl.m4/1.4/Thu Feb  9 19:29:40 2006//
-/telnet.m4/1.13/Wed May  3 15:43:58 2006//
-/ucdsnmp.m4/1.11/Thu Feb  9 19:29:40 2006//
-/util.m4/1.10/Thu Feb  9 19:29:40 2006//
-/zephyr.m4/1.2/Thu Feb  9 19:29:40 2006//
+/COPYING/1.1/Fri Oct  2 21:35:59 1998//Tcyrus-imapd-2_2-tail
+/README.andrew/1.11/Mon Feb 16 16:23:42 2004//Tcyrus-imapd-2_2-tail
+/afs.m4/1.29/Tue Apr 26 19:14:07 2005//Tcyrus-imapd-2_2-tail
+/agentx.m4/1.5/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/arx.m4/1.6/Tue Apr 26 19:14:07 2005//Tcyrus-imapd-2_2-tail
+/ax_path_bdb.m4/1.1/Thu Jan  6 20:24:52 2005//Tcyrus-imapd-2_2-tail
+/berkdb.m4/1.20/Tue Apr 26 19:14:07 2005//Tcyrus-imapd-2_2-tail
+/bsd_sockets.m4/1.10/Tue Apr 26 19:14:07 2005//Tcyrus-imapd-2_2-tail
+/c-attribute.m4/1.3/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/c-fpic.m4/1.2/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/clamav.m4/1.2/Sat May 28 02:26:59 2005//Tcyrus-imapd-2_2-tail
+/com_err.m4/1.6/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/com_err_link.m4/1.9/Sat Feb 25 18:32:46 2006//Tcyrus-imapd-2_2-tail
+/common.m4/1.13/Sat Feb 25 18:29:46 2006//Tcyrus-imapd-2_2-tail
+/cyrus.m4/1.4/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/db.m4/1.2/Sat Feb 14 21:16:18 2004//Tcyrus-imapd-2_2-tail
+/find-func-no-libs.m4/1.2/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/find-func-no-libs2.m4/1.2/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/find-func.m4/1.2/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/heimdal.m4/1.9/Tue Apr 26 19:14:07 2005//Tcyrus-imapd-2_2-tail
+/init_automake.m4/1.4/Wed Oct  8 20:35:24 2003//Tcyrus-imapd-2_2-tail
+/ipv6.m4/1.6/Wed Dec 10 17:59:31 2003//Tcyrus-imapd-2_2-tail
+/kafs.m4/1.7/Tue Apr 26 19:14:07 2005//Tcyrus-imapd-2_2-tail
+/kerberos_v4.m4/1.28/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/kerberos_v5.m4/1.9/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/libXau.m4/1.5/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/libcyrus.m4/1.20/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/libloguse.m4/1.7/Sat Feb 25 18:26:22 2006//Tcyrus-imapd-2_2-tail
+/libnet.m4/1.8/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/libpcap.m4/1.9/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/librestrict.m4/1.6/Sat Feb 25 18:26:22 2006//Tcyrus-imapd-2_2-tail
+/libssl.m4/1.10/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/libtoolhack.m4/1.4/Wed Oct  8 20:35:25 2003//Tcyrus-imapd-2_2-tail
+/libwrap.m4/1.10/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/mips-abi.m4/1.5/Wed Oct  8 20:35:25 2003//Tcyrus-imapd-2_2-tail
+/nadine.m4/1.6/Wed Oct  8 20:35:25 2003//Tcyrus-imapd-2_2-tail
+/nana.m4/1.5/Wed Oct  8 20:35:25 2003//Tcyrus-imapd-2_2-tail
+/openldap.m4/1.2/Mon Mar 13 19:16:11 2006//Tcyrus-imapd-2_2-tail
+/openssl.m4/1.11/Wed May 17 18:30:19 2006//Tcyrus-imapd-2_2-tail
+/pthreads.m4/1.11/Wed Oct  8 20:35:25 2003//Tcyrus-imapd-2_2-tail
+/sasl.m4/1.23/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/sasl2.m4/1.52/Thu May 18 19:25:00 2006//Tcyrus-imapd-2_2-tail
+/tcl.m4/1.4/Wed Oct  8 20:35:25 2003//Tcyrus-imapd-2_2-tail
+/telnet.m4/1.13/Sat Feb 25 18:36:36 2006//Tcyrus-imapd-2_2-tail
+/ucdsnmp.m4/1.11/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
+/util.m4/1.10/Wed Oct  8 20:35:26 2003//Tcyrus-imapd-2_2-tail
+/zephyr.m4/1.2/Tue Apr 26 19:14:08 2005//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/cmulocal/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/contrib/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/contrib/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,11 +1,11 @@
+/README/1.3/Sat May 25 19:57:43 2002//Tcyrus-imapd-2_2-tail
+/add-cyrus-user/1.1/Fri Jun 27 13:56:00 2003//Tcyrus-imapd-2_2-tail
+/deliver-notify-zephyr.patch/1.2/Sat May 25 19:57:43 2002//Tcyrus-imapd-2_2-tail
+/drac_auth.patch/1.18/Fri Dec 19 20:01:58 2003//Tcyrus-imapd-2_2-tail
+/fud-client.c/1.5/Thu Feb 13 20:15:18 2003//Tcyrus-imapd-2_2-tail
+/mupdate-test.pl/1.1/Thu Dec 18 20:26:01 2003//Tcyrus-imapd-2_2-tail
+/sieve-spamasssassin/1.1/Thu May  9 22:00:46 2002//Tcyrus-imapd-2_2-tail
+/squatrunner.pl/1.1/Thu Dec 19 21:56:03 2002//Tcyrus-imapd-2_2-tail
+/squatrunner.txt/1.1/Thu Dec 19 21:56:03 2002//Tcyrus-imapd-2_2-tail
 D/cyrus-graphtools.1.0////
 D/notify_unix////
-/README/1.3/Thu Feb  9 19:29:40 2006//
-/add-cyrus-user/1.1/Thu Feb  9 19:29:40 2006//
-/deliver-notify-zephyr.patch/1.2/Thu Feb  9 19:29:40 2006//
-/drac_auth.patch/1.18/Thu Feb  9 19:29:40 2006//
-/fud-client.c/1.5/Thu Feb  9 19:29:40 2006//
-/mupdate-test.pl/1.1/Thu Feb  9 19:29:40 2006//
-/sieve-spamasssassin/1.1/Thu Feb  9 19:29:40 2006//
-/squatrunner.pl/1.1/Thu Feb  9 19:29:40 2006//
-/squatrunner.txt/1.1/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/contrib/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/contrib/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
+/README/1.4/Mon Nov 19 23:18:21 2001//Tcyrus-imapd-2_2-tail
 D/cgi-bin////
 D/html////
 D/script////
-/README/1.4/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
-/cyrus_master.pl/1.1/Thu Feb  9 19:29:40 2006//
-/graph_cyrus_db-sum.pl/1.1/Thu Feb  9 19:29:40 2006//
-/graph_cyrus_db.pl/1.1/Thu Feb  9 19:29:40 2006//
+/cyrus_master.pl/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-imapd-2_2-tail
+/graph_cyrus_db-sum.pl/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-imapd-2_2-tail
+/graph_cyrus_db.pl/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,2 +1,2 @@
-/index.html/1.1/Thu Feb  9 19:29:40 2006//
+/index.html/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/html/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
-/cyrus.pl/1.1/Thu Feb  9 19:29:40 2006//
-/cyrusrc/1.1/Thu Feb  9 19:29:40 2006//
-/run/1.1/Thu Feb  9 19:29:40 2006//
+/cyrus.pl/1.1/Sun Jan 28 22:43:02 2001//Tcyrus-imapd-2_2-tail
+/cyrusrc/1.1/Sun Jan 28 22:43:02 2001//Tcyrus-imapd-2_2-tail
+/run/1.1/Sun Jan 28 22:43:02 2001//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/contrib/cyrus-graphtools.1.0/script/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,6 +1,6 @@
-/README/1.1/Thu Feb  9 19:29:40 2006//
-/net-server-prefork-0.01.tgz/1.1/Thu Feb  9 19:29:40 2006//
-/notify/1.1/Thu Feb  9 19:29:40 2006//
-/simple_notify.pl/1.1/Thu Feb  9 19:29:40 2006//
-/sql_notify.pl/1.1/Thu Feb  9 19:29:40 2006//
+/README/1.1/Sat Jun 23 01:01:48 2001//Tcyrus-imapd-2_2-tail
+/net-server-prefork-0.01.tgz/1.1/Sat Jun 23 01:01:48 2001//Tcyrus-imapd-2_2-tail
+/notify/1.1/Sat Jun 23 01:01:48 2001//Tcyrus-imapd-2_2-tail
+/simple_notify.pl/1.1/Sat Jun 23 01:01:49 2001//Tcyrus-imapd-2_2-tail
+/sql_notify.pl/1.1/Sat Jun 23 01:01:49 2001//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/contrib/notify_unix/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/depot/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/depot/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/depot/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/depot/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,6 +1,6 @@
-/.cvsignore/1.1/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.7/Thu Feb  9 19:29:40 2006//
-/depot.conf/1.5/Thu Feb  9 19:29:40 2006//
-/rc.local.imap/1.2/Thu Feb  9 19:29:40 2006//
-/rc.local.ptclient/1.2/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.1/Sun Jan  6 20:23:54 2002//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.7/Fri May 28 13:39:38 2004//Tcyrus-imapd-2_2-tail
+/depot.conf/1.5/Thu Oct 13 19:57:05 2005//Tcyrus-imapd-2_2-tail
+/rc.local.imap/1.2/Thu Aug  2 19:20:41 2001//Tcyrus-imapd-2_2-tail
+/rc.local.ptclient/1.2/Tue Dec 26 19:30:48 2000//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/depot/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/depot/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/depot/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/depot/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/doc/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/doc/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/doc/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/doc/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,39 +1,38 @@
-D/html////
+/.cvsignore/1.3/Wed Oct 22 18:02:52 2003//Tcyrus-imapd-2_2-tail
+/Makefile.dist/1.11/Wed Oct 22 18:50:04 2003//Tcyrus-imapd-2_2-tail
+/altnamespace.html/1.2/Tue Oct 23 20:15:18 2001//Tcyrus-imapd-2_2-tail
+/anoncvs.html/1.3/Sat May 25 19:57:43 2002//Tcyrus-imapd-2_2-tail
+/bugs.html/1.28/Mon Mar 22 00:30:59 2004//Tcyrus-imapd-2_2-tail
+/changes.html/1.104/Wed Aug 30 16:29:10 2006//Tcyrus-imapd-2_2-tail
+/cyrusv2.mc/1.4/Thu Aug 23 23:26:56 2001//Tcyrus-imapd-2_2-tail
+/faq.html/1.36/Sun Mar  7 21:56:48 2004//Tcyrus-imapd-2_2-tail
+/feedback.html/1.6/Fri Aug 15 17:37:04 2003//Tcyrus-imapd-2_2-tail
+/index.html/1.12/Wed Oct 22 18:50:04 2003//Tcyrus-imapd-2_2-tail
+/install-admin-mb.html/1.4/Mon Jun 21 18:41:45 2004//Tcyrus-imapd-2_2-tail
+/install-auth.html/1.12/Mon Jul 28 02:47:09 2003//Tcyrus-imapd-2_2-tail
+/install-compile.html/1.17/Fri Jan 16 14:20:42 2004//Tcyrus-imapd-2_2-tail
+/install-configure.html/1.33/Wed Feb 11 14:28:59 2004//Tcyrus-imapd-2_2-tail
+/install-murder.html/1.20/Wed Oct 29 19:27:55 2003//Tcyrus-imapd-2_2-tail
+/install-netnews.html/1.6/Fri Feb  6 18:12:50 2004//Tcyrus-imapd-2_2-tail
+/install-perf.html/1.10/Thu Jan  2 19:23:11 2003//Tcyrus-imapd-2_2-tail
+/install-prereq.html/1.12/Wed Oct 22 18:50:04 2003//Tcyrus-imapd-2_2-tail
+/install-sieve.html/1.4/Tue Oct 23 18:14:48 2001//Tcyrus-imapd-2_2-tail
+/install-snmpmon.html/1.1/Tue Apr 25 02:56:42 2000//Tcyrus-imapd-2_2-tail
+/install-testing.html/1.3/Thu Aug 22 13:49:30 2002//Tcyrus-imapd-2_2-tail
+/install-upgrade.html/1.34/Wed Jan  7 20:08:43 2004//Tcyrus-imapd-2_2-tail
+/install-virtdomains.html/1.3/Mon Dec 29 20:22:53 2003//Tcyrus-imapd-2_2-tail
+/install.html/1.9/Wed Oct 22 18:50:04 2003//Tcyrus-imapd-2_2-tail
+/mailing-list.html/1.5/Mon Feb 24 23:56:23 2003//Tcyrus-imapd-2_2-tail
+/man.html/1.17/Mon Mar 22 00:31:00 2004//Tcyrus-imapd-2_2-tail
+/murder.fig/1.5/Sun Feb  1 03:31:49 2004//Tcyrus-imapd-2_2-tail
+/netnews.fig/1.2/Wed Oct 22 18:02:53 2003//Tcyrus-imapd-2_2-tail
+/notes.html/1.2/Sat May 25 19:57:43 2002//Tcyrus-imapd-2_2-tail
+/os.html/1.4/Sun Nov 18 19:50:43 2001//Tcyrus-imapd-2_2-tail
+/overview.html/1.24/Thu Jul 22 13:26:09 2004//Tcyrus-imapd-2_2-tail
+/questions.html/1.3/Thu Oct 16 15:33:31 2003//Tcyrus-imapd-2_2-tail
+/readme.html/1.19/Wed Oct 22 18:50:04 2003//Tcyrus-imapd-2_2-tail
+/sieve-protocol.html/1.3/Fri May  2 17:01:57 2003//Tcyrus-imapd-2_2-tail
+/sieve.html/1.1/Tue Apr 25 02:56:46 2000//Tcyrus-imapd-2_2-tail
+/specs.html/1.65/Fri Mar 31 15:22:58 2006//Tcyrus-imapd-2_2-tail
 D/internal////
 D/text////
-/.cvsignore/1.3/Thu Feb  9 19:29:40 2006//
-/Makefile.dist/1.11/Thu Feb  9 19:29:40 2006//
-/altnamespace.html/1.2/Thu Feb  9 19:29:40 2006//
-/anoncvs.html/1.3/Thu Feb  9 19:29:40 2006//
-/bugs.html/1.28/Thu Feb  9 19:29:40 2006//
-/changes.html/1.104/Thu Aug 31 11:01:30 2006//T1.104
-/cyrusv2.mc/1.4/Thu Feb  9 19:29:40 2006//
-/faq.html/1.36/Thu Feb  9 19:29:40 2006//
-/feedback.html/1.6/Thu Feb  9 19:29:40 2006//
-/index.html/1.12/Thu Feb  9 19:29:40 2006//
-/install-admin-mb.html/1.4/Thu Feb  9 19:29:40 2006//
-/install-auth.html/1.12/Thu Feb  9 19:29:40 2006//
-/install-compile.html/1.17/Thu Feb  9 19:29:40 2006//
-/install-configure.html/1.33/Thu Feb  9 19:29:40 2006//
-/install-murder.html/1.20/Thu Feb  9 19:29:40 2006//
-/install-netnews.html/1.6/Thu Feb  9 19:29:40 2006//
-/install-perf.html/1.10/Thu Feb  9 19:29:40 2006//
-/install-prereq.html/1.12/Thu Feb  9 19:29:40 2006//
-/install-sieve.html/1.4/Thu Feb  9 19:29:40 2006//
-/install-snmpmon.html/1.1/Thu Feb  9 19:29:40 2006//
-/install-testing.html/1.3/Thu Feb  9 19:29:40 2006//
-/install-upgrade.html/1.34/Thu Feb  9 19:29:40 2006//
-/install-virtdomains.html/1.3/Thu Feb  9 19:29:40 2006//
-/install.html/1.9/Thu Feb  9 19:29:40 2006//
-/mailing-list.html/1.5/Thu Feb  9 19:29:40 2006//
-/man.html/1.17/Thu Feb  9 19:29:40 2006//
-/murder.fig/1.5/Thu Feb  9 19:29:40 2006//
-/netnews.fig/1.2/Thu Feb  9 19:29:40 2006//
-/notes.html/1.2/Thu Feb  9 19:29:40 2006//
-/os.html/1.4/Thu Feb  9 19:29:40 2006//
-/overview.html/1.24/Thu Feb  9 19:29:40 2006//
-/questions.html/1.3/Thu Feb  9 19:29:40 2006//
-/readme.html/1.19/Thu Feb  9 19:29:40 2006//
-/sieve-protocol.html/1.3/Thu Feb  9 19:29:40 2006//
-/sieve.html/1.1/Thu Feb  9 19:29:40 2006//
-/specs.html/1.65/Wed May  3 15:43:58 2006//

Added: branches/cvsmerge/cyrus-cvs/doc/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/doc/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/doc/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/doc/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,11 +1,11 @@
-/bytecode/1.2/Thu Feb  9 19:29:40 2006//
-/database-formats.html/1.2/Thu Feb  9 19:29:40 2006//
-/hacking/1.2/Thu Feb  9 19:29:40 2006//
-/internationalization.html/1.7/Thu Feb  9 19:29:40 2006//
-/locking/1.2/Thu Feb  9 19:29:40 2006//
-/mailbox-format.html/1.4/Thu Feb  9 19:29:40 2006//
-/master-state-machine.fig/1.2/Thu Feb  9 19:29:40 2006//
-/prot-events/1.1/Thu Feb  9 19:29:40 2006//
-/prot.html/1.3/Thu Feb  9 19:29:40 2006//
-/specials/1.1/Thu Feb  9 19:29:40 2006//
+/bytecode/1.2/Wed Oct 22 18:02:54 2003//Tcyrus-imapd-2_2-tail
+/database-formats.html/1.2/Thu Apr 22 14:49:39 2004//Tcyrus-imapd-2_2-tail
+/hacking/1.2/Wed Oct 22 18:02:54 2003//Tcyrus-imapd-2_2-tail
+/internationalization.html/1.7/Wed Oct 22 18:50:05 2003//Tcyrus-imapd-2_2-tail
+/locking/1.2/Sat May 25 19:57:43 2002//Tcyrus-imapd-2_2-tail
+/mailbox-format.html/1.4/Fri Jan  9 01:37:20 2004//Tcyrus-imapd-2_2-tail
+/master-state-machine.fig/1.2/Wed Oct 22 18:02:54 2003//Tcyrus-imapd-2_2-tail
+/prot-events/1.1/Sun Feb  3 15:47:54 2002//Tcyrus-imapd-2_2-tail
+/prot.html/1.3/Wed Aug  6 21:28:05 2003//Tcyrus-imapd-2_2-tail
+/specials/1.1/Wed May  5 20:55:54 2004//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/doc/internal/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/doc/text/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/doc/text/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/doc/text/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/doc/text/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile/1.4/Thu Feb  9 19:29:40 2006//
-/htmlstrip.c/1.9/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.2/Wed Oct 22 18:02:55 2003//Tcyrus-imapd-2_2-tail
+/Makefile/1.4/Thu Nov 14 15:27:35 2002//Tcyrus-imapd-2_2-tail
+/htmlstrip.c/1.9/Wed Oct 22 18:50:06 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/doc/text/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/doc/text/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/doc/text/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/doc/text/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/et/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/et/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/et/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/et/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,22 +1,22 @@
-/.cvsignore/1.1/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.13/Thu Feb  9 19:29:40 2006//
-/com_err.3/1.2/Thu Feb  9 19:29:40 2006//
-/com_err.c/1.6/Thu Feb  9 19:29:40 2006//
-/com_err.h/1.3/Thu Feb  9 19:29:40 2006//
-/com_err.texinfo/1.1/Thu Feb  9 19:29:40 2006//
-/compile_et.1/1.2/Thu Feb  9 19:29:40 2006//
-/compile_et.sh/1.2/Thu Feb  9 19:29:40 2006//
-/config_script/1.2/Thu Feb  9 19:29:40 2006//
-/error_message.c/1.6/Thu Feb  9 19:29:40 2006//
-/error_table.h/1.3/Thu Feb  9 19:29:40 2006//
-/et_c.awk/1.1/Thu Feb  9 19:29:40 2006//
-/et_h.awk/1.1/Thu Feb  9 19:29:40 2006//
-/et_name.c/1.3/Thu Feb  9 19:29:40 2006//
-/init_et.c/1.3/Thu Feb  9 19:29:40 2006//
-/internal.h/1.3/Thu Feb  9 19:29:40 2006//
-/mit-sipb-copyright.h/1.1/Thu Feb  9 19:29:40 2006//
-/test1.et/1.1/Thu Feb  9 19:29:40 2006//
-/test2.et/1.1/Thu Feb  9 19:29:40 2006//
-/test_et.c/1.1/Thu Feb  9 19:29:40 2006//
-/texinfo.tex/1.1/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.1/Sun Jan  6 02:03:30 2002//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.13/Tue Nov 27 02:24:56 2001//Tcyrus-imapd-2_2-tail
+/com_err.3/1.2/Tue May 23 20:52:06 2000//Tcyrus-imapd-2_2-tail
+/com_err.c/1.6/Sat May 22 03:45:47 2004//Tcyrus-imapd-2_2-tail
+/com_err.h/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-imapd-2_2-tail
+/com_err.texinfo/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
+/compile_et.1/1.2/Tue May 23 20:52:06 2000//Tcyrus-imapd-2_2-tail
+/compile_et.sh/1.2/Tue May 23 20:52:06 2000//Tcyrus-imapd-2_2-tail
+/config_script/1.2/Tue May 23 20:52:06 2000//Tcyrus-imapd-2_2-tail
+/error_message.c/1.6/Sat May 22 03:45:47 2004//Tcyrus-imapd-2_2-tail
+/error_table.h/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-imapd-2_2-tail
+/et_c.awk/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
+/et_h.awk/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
+/et_name.c/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-imapd-2_2-tail
+/init_et.c/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-imapd-2_2-tail
+/internal.h/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-imapd-2_2-tail
+/mit-sipb-copyright.h/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
+/test1.et/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
+/test2.et/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
+/test_et.c/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
+/texinfo.tex/1.1/Wed Jul  5 18:34:05 1995//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/et/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/et/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/et/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/et/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/imap/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/imap/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,118 +1,118 @@
-/.cvsignore/1.10/Thu Feb  9 19:29:40 2006//
-/Makefile.dist/1.8/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.184/Thu Feb  9 19:29:40 2006//
-/annotate.c/1.33/Sun Jun  4 20:06:52 2006//
-/annotate.h/1.9/Thu Feb  9 19:29:40 2006//
-/append.c/1.108/Thu Feb  9 19:29:40 2006//
-/append.h/1.27/Thu Feb  9 19:29:40 2006//
-/arbitron.c/1.39/Thu Feb  9 19:29:40 2006//
-/backend.c/1.42/Thu Aug 31 11:01:30 2006//T1.42
-/backend.h/1.12/Thu Feb  9 19:29:40 2006//
-/chk_cyrus.c/1.16/Thu Feb  9 19:29:40 2006//
-/cli_fatal.c/1.3/Thu Feb  9 19:29:40 2006//
-/convert_code.c/1.7/Thu Feb  9 19:29:40 2006//
-/convert_code.h/1.6/Thu Feb  9 19:29:40 2006//
-/ctl_cyrusdb.c/1.27/Thu Feb  9 19:29:40 2006//
-/ctl_deliver.c/1.20/Thu Feb  9 19:29:40 2006//
-/ctl_mboxlist.c/1.50/Wed May  3 15:43:58 2006//
-/cvt_cyrusdb.c/1.15/Thu Feb  9 19:29:40 2006//
-/cyr_expire.c/1.7/Thu Feb  9 19:29:40 2006//
-/cyrdump.c/1.16/Thu Feb  9 19:29:40 2006//
-/deliver.c/1.174/Thu Feb  9 19:29:40 2006//
-/duplicate.c/1.41/Thu Feb  9 19:29:40 2006//
-/duplicate.h/1.15/Thu Feb  9 19:29:40 2006//
-/fetchnews.c/1.15/Wed May  3 15:43:58 2006//
-/fud.c/1.53/Thu Feb  9 19:29:40 2006//
-/global.c/1.19/Thu Feb  9 19:29:40 2006//
-/global.h/1.7/Thu Feb  9 19:29:40 2006//
-/idle.h/1.7/Thu Feb  9 19:29:40 2006//
-/idle_idled.c/1.16/Thu Feb  9 19:29:40 2006//
-/idle_no.c/1.6/Thu Feb  9 19:29:40 2006//
-/idle_poll.c/1.12/Thu Feb  9 19:29:40 2006//
-/idled.c/1.23/Thu Feb  9 19:29:40 2006//
-/idled.h/1.4/Thu Feb  9 19:29:40 2006//
-/imap_err.et/1.52/Thu Feb  9 19:29:40 2006//
-/imapd.h/1.62/Thu Feb  9 19:29:40 2006//
-/imapparse.c/1.15/Thu Feb  9 19:29:40 2006//
-/index.c/1.218/Thu Feb  9 19:29:40 2006//
-/index.h/1.10/Thu Feb  9 19:29:40 2006//
-/ipurge.c/1.25/Thu Feb  9 19:29:40 2006//
-/lmtp_sieve.c/1.12/Fri May 12 09:49:46 2006//
-/lmtp_sieve.h/1.3/Thu Feb  9 19:29:40 2006//
-/lmtpd.c/1.144/Fri May 12 09:49:46 2006//
-/lmtpd.h/1.3/Thu Feb  9 19:29:40 2006//
-/lmtpengine.c/1.116/Thu Feb  9 19:29:40 2006//
-/lmtpengine.h/1.22/Thu Feb  9 19:29:40 2006//
-/lmtpproxyd.c/1.69/Thu Feb  9 19:29:40 2006//
-/lmtpstats.snmp/1.6/Thu Feb  9 19:29:40 2006//
-/mailbox.c/1.162/Sun Aug  6 18:06:01 2006//
-/mailbox.h/1.81/Thu Feb  9 19:29:40 2006//
-/mbdump.c/1.31/Fri May 12 09:47:51 2006//
-/mbdump.h/1.4/Thu Feb  9 19:29:40 2006//
-/mbexamine.c/1.11/Thu Feb  9 19:29:40 2006//
-/mboxlist.c/1.242/Fri May 12 09:50:36 2006//
-/mboxlist.h/1.39/Thu Feb  9 19:29:40 2006//
-/mboxname.c/1.36/Thu Feb  9 19:29:40 2006//
-/mboxname.h/1.13/Thu Feb  9 19:29:40 2006//
-/mbpath.c/1.19/Wed May  3 15:43:58 2006//
-/message.c/1.99/Thu Feb  9 19:29:40 2006//
-/message.h/1.6/Thu Feb  9 19:29:40 2006//
-/mupdate-client.c/1.47/Thu Feb  9 19:29:40 2006//
-/mupdate-client.h/1.15/Thu Feb  9 19:29:40 2006//
-/mupdate-slave.c/1.27/Thu Feb  9 19:29:40 2006//
-/mupdate.c/1.92/Thu Feb  9 19:29:40 2006//
-/mupdate.h/1.16/Thu Feb  9 19:29:40 2006//
-/mupdate_err.et/1.5/Thu Feb  9 19:29:40 2006//
-/mutex.h/1.2/Thu Feb  9 19:29:40 2006//
-/mutex_fake.c/1.2/Thu Feb  9 19:29:40 2006//
-/mutex_pthread.c/1.2/Thu Feb  9 19:29:40 2006//
-/nntp_err.et/1.2/Thu Feb  9 19:29:40 2006//
-/nntpd.c/1.52/Wed May  3 15:43:58 2006//
-/notify.c/1.13/Thu Feb  9 19:29:40 2006//
-/notify.h/1.7/Thu Feb  9 19:29:40 2006//
-/pop3d.c/1.168/Wed May  3 15:43:58 2006//
-/proc.c/1.25/Thu Feb  9 19:29:40 2006//
-/protocol.c/1.14/Thu Aug 31 11:01:30 2006//T1.14
-/protocol.h/1.6/Thu Aug 31 11:01:30 2006//T1.6
-/proxyd.c/1.201/Wed May  3 15:43:58 2006//
-/pushstats.snmp/1.10/Thu Feb  9 19:29:40 2006//
-/quota.c/1.65/Thu Feb  9 19:29:40 2006//
-/quota.h/1.2/Thu Feb  9 19:29:40 2006//
-/quota_db.c/1.2/Thu Feb  9 19:29:40 2006//
-/reconstruct.c/1.88/Thu Feb  9 19:29:40 2006//
-/saslclient.c/1.14/Thu Aug 31 11:01:30 2006//T1.14
-/saslclient.h/1.2/Thu Feb  9 19:29:40 2006//
-/saslserver.c/1.9/Thu Feb  9 19:29:40 2006//
-/search_engines.c/1.5/Thu Feb  9 19:29:40 2006//
-/search_engines.h/1.2/Thu Feb  9 19:29:40 2006//
-/seen.h/1.14/Thu Feb  9 19:29:40 2006//
-/seen_bigdb.c/1.10/Thu Feb  9 19:29:40 2006//
-/seen_db.c/1.48/Thu Feb  9 19:29:40 2006//
-/seen_local.c/1.43/Thu Feb  9 19:29:40 2006//
-/setproctitle.c/1.16/Thu Feb  9 19:29:40 2006//
-/signals.c/1.13/Thu Feb  9 19:29:40 2006//
-/signals.h/1.1/Thu Feb  9 19:29:40 2006//
-/smmapd.c/1.13/Thu Feb  9 19:29:40 2006//
-/smtpclient.c/1.2/Thu Feb  9 19:29:40 2006//
-/smtpclient.h/1.2/Thu Feb  9 19:29:40 2006//
-/spool.c/1.8/Thu Feb  9 19:29:40 2006//
-/spool.h/1.4/Thu Feb  9 19:29:40 2006//
-/squat.c/1.7/Thu Feb  9 19:29:40 2006//
-/squat.h/1.2/Thu Feb  9 19:29:40 2006//
-/squat_build.c/1.10/Thu Feb  9 19:29:40 2006//
-/squat_internal.c/1.2/Thu Feb  9 19:29:40 2006//
-/squat_internal.h/1.2/Thu Feb  9 19:29:40 2006//
-/squatter.c/1.15/Thu Feb  9 19:29:40 2006//
-/syncnews.c/1.26/Thu Feb  9 19:29:40 2006//
-/telemetry.c/1.8/Thu Feb  9 19:29:40 2006//
-/telemetry.h/1.3/Thu Feb  9 19:29:40 2006//
-/tls.c/1.51/Thu Feb  9 19:29:40 2006//
-/tls.h/1.18/Thu Feb  9 19:29:40 2006//
-/tls_prune.c/1.6/Thu Feb  9 19:29:40 2006//
-/user.c/1.20/Thu Feb  9 19:29:40 2006//
-/user.h/1.6/Thu Feb  9 19:29:40 2006//
-/version.c/1.19/Thu Feb  9 19:29:40 2006//
-/version.h/1.140/Wed May  3 15:43:58 2006//
-/xversion.sh/1.7/Thu Feb  9 19:29:40 2006//
-/imapd.c/1.501/Mon Nov 13 18:06:49 2006//
+/.cvsignore/1.10/Mon Dec  1 21:00:52 2003//Tcyrus-imapd-2_2-tail
+/Makefile.dist/1.8/Mon Mar  1 19:47:35 2004//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.184/Fri May 28 18:03:02 2004//Tcyrus-imapd-2_2-tail
+/annotate.c/1.33/Thu Jun  1 13:26:07 2006//Tcyrus-imapd-2_2-tail
+/annotate.h/1.9/Wed Aug  4 13:03:12 2004//Tcyrus-imapd-2_2-tail
+/append.c/1.108/Thu Jun  2 15:47:50 2005//Tcyrus-imapd-2_2-tail
+/append.h/1.27/Thu Jun  2 15:47:51 2005//Tcyrus-imapd-2_2-tail
+/arbitron.c/1.39/Fri Jan 13 16:47:18 2006//Tcyrus-imapd-2_2-tail
+/backend.c/1.42/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/backend.h/1.12/Thu Jan 12 22:17:57 2006//Tcyrus-imapd-2_2-tail
+/chk_cyrus.c/1.16/Wed Aug  4 13:03:12 2004//Tcyrus-imapd-2_2-tail
+/cli_fatal.c/1.3/Fri Oct 24 18:24:05 2003//Tcyrus-imapd-2_2-tail
+/convert_code.c/1.7/Thu Feb 13 20:15:23 2003//Tcyrus-imapd-2_2-tail
+/convert_code.h/1.6/Wed Oct 22 18:50:07 2003//Tcyrus-imapd-2_2-tail
+/ctl_cyrusdb.c/1.27/Wed Feb 16 20:37:58 2005//Tcyrus-imapd-2_2-tail
+/ctl_deliver.c/1.20/Sat May 22 03:45:48 2004//Tcyrus-imapd-2_2-tail
+/ctl_mboxlist.c/1.50/Thu Apr  6 15:33:08 2006//Tcyrus-imapd-2_2-tail
+/cvt_cyrusdb.c/1.15/Sat May 22 03:45:48 2004//Tcyrus-imapd-2_2-tail
+/cyr_expire.c/1.7/Sat May 22 03:45:48 2004//Tcyrus-imapd-2_2-tail
+/cyrdump.c/1.16/Sat May 22 03:45:48 2004//Tcyrus-imapd-2_2-tail
+/deliver.c/1.174/Sat May 22 03:45:48 2004//Tcyrus-imapd-2_2-tail
+/duplicate.c/1.41/Thu Mar 11 18:36:42 2004//Tcyrus-imapd-2_2-tail
+/duplicate.h/1.15/Thu Feb 12 02:32:22 2004//Tcyrus-imapd-2_2-tail
+/fetchnews.c/1.15/Mon Apr 10 16:19:33 2006//Tcyrus-imapd-2_2-tail
+/fud.c/1.53/Wed Apr 13 15:42:04 2005//Tcyrus-imapd-2_2-tail
+/global.c/1.19/Thu Mar  3 15:59:12 2005//Tcyrus-imapd-2_2-tail
+/global.h/1.7/Wed Feb 16 20:37:58 2005//Tcyrus-imapd-2_2-tail
+/idle.h/1.7/Fri Dec  9 16:12:50 2005//Tcyrus-imapd-2_2-tail
+/idle_idled.c/1.16/Fri Dec  9 21:09:14 2005//Tcyrus-imapd-2_2-tail
+/idle_no.c/1.6/Fri Dec  9 16:12:50 2005//Tcyrus-imapd-2_2-tail
+/idle_poll.c/1.12/Fri Dec  9 19:15:35 2005//Tcyrus-imapd-2_2-tail
+/idled.c/1.23/Tue Jul 27 16:19:44 2004//Tcyrus-imapd-2_2-tail
+/idled.h/1.4/Thu Feb 13 20:15:24 2003//Tcyrus-imapd-2_2-tail
+/imap_err.et/1.52/Wed Oct 22 20:05:11 2003//Tcyrus-imapd-2_2-tail
+/imapd.c/1.501/Mon Nov 13 16:17:52 2006//Tcyrus-imapd-2_2-tail
+/imapd.h/1.62/Thu Jun  2 15:47:57 2005//Tcyrus-imapd-2_2-tail
+/imapparse.c/1.15/Tue Oct 18 23:38:43 2005//Tcyrus-imapd-2_2-tail
+/index.c/1.218/Thu Jun  2 15:47:58 2005//Tcyrus-imapd-2_2-tail
+/index.h/1.10/Sat May 22 03:45:50 2004//Tcyrus-imapd-2_2-tail
+/ipurge.c/1.25/Wed May 26 15:32:10 2004//Tcyrus-imapd-2_2-tail
+/lmtp_sieve.c/1.12/Wed May 10 16:27:17 2006//Tcyrus-imapd-2_2-tail
+/lmtp_sieve.h/1.3/Thu Oct 20 15:29:02 2005//Tcyrus-imapd-2_2-tail
+/lmtpd.c/1.144/Wed May 10 16:27:17 2006//Tcyrus-imapd-2_2-tail
+/lmtpd.h/1.3/Mon Oct 31 14:21:54 2005//Tcyrus-imapd-2_2-tail
+/lmtpengine.c/1.116/Tue Nov  1 19:47:47 2005//Tcyrus-imapd-2_2-tail
+/lmtpengine.h/1.22/Thu Mar  4 16:09:32 2004//Tcyrus-imapd-2_2-tail
+/lmtpproxyd.c/1.69/Tue Nov 29 16:22:35 2005//Tcyrus-imapd-2_2-tail
+/lmtpstats.snmp/1.6/Thu Oct 12 19:13:57 2000//Tcyrus-imapd-2_2-tail
+/mailbox.c/1.162/Fri Aug  4 14:40:54 2006//Tcyrus-imapd-2_2-tail
+/mailbox.h/1.81/Thu Jan 22 21:17:09 2004//Tcyrus-imapd-2_2-tail
+/mbdump.c/1.31/Thu May 11 17:43:18 2006//Tcyrus-imapd-2_2-tail
+/mbdump.h/1.4/Thu Feb 13 20:15:27 2003//Tcyrus-imapd-2_2-tail
+/mbexamine.c/1.11/Fri Dec 17 16:32:16 2004//Tcyrus-imapd-2_2-tail
+/mboxlist.c/1.242/Wed May 10 15:41:52 2006//Tcyrus-imapd-2_2-tail
+/mboxlist.h/1.39/Wed Mar 17 18:07:49 2004//Tcyrus-imapd-2_2-tail
+/mboxname.c/1.36/Mon Feb 14 06:39:57 2005//Tcyrus-imapd-2_2-tail
+/mboxname.h/1.13/Fri Mar 19 14:49:17 2004//Tcyrus-imapd-2_2-tail
+/mbpath.c/1.19/Sat Feb 25 18:31:51 2006//Tcyrus-imapd-2_2-tail
+/message.c/1.99/Thu Sep 16 17:58:54 2004//Tcyrus-imapd-2_2-tail
+/message.h/1.6/Thu Feb 13 20:15:28 2003//Tcyrus-imapd-2_2-tail
+/mupdate-client.c/1.47/Wed Nov 23 13:40:09 2005//Tcyrus-imapd-2_2-tail
+/mupdate-client.h/1.15/Wed Nov 23 13:40:09 2005//Tcyrus-imapd-2_2-tail
+/mupdate-slave.c/1.27/Wed Nov 23 13:40:09 2005//Tcyrus-imapd-2_2-tail
+/mupdate.c/1.92/Fri Nov  4 13:33:30 2005//Tcyrus-imapd-2_2-tail
+/mupdate.h/1.16/Wed Dec 10 16:07:03 2003//Tcyrus-imapd-2_2-tail
+/mupdate_err.et/1.5/Wed Mar 20 23:03:06 2002//Tcyrus-imapd-2_2-tail
+/mutex.h/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-imapd-2_2-tail
+/mutex_fake.c/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-imapd-2_2-tail
+/mutex_pthread.c/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-imapd-2_2-tail
+/nntp_err.et/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-imapd-2_2-tail
+/nntpd.c/1.52/Fri Apr  7 19:58:23 2006//Tcyrus-imapd-2_2-tail
+/notify.c/1.13/Wed Oct 22 18:50:08 2003//Tcyrus-imapd-2_2-tail
+/notify.h/1.7/Wed Oct 22 18:50:08 2003//Tcyrus-imapd-2_2-tail
+/pop3d.c/1.168/Fri Apr  7 19:58:25 2006//Tcyrus-imapd-2_2-tail
+/proc.c/1.25/Wed Oct 22 18:50:08 2003//Tcyrus-imapd-2_2-tail
+/protocol.c/1.14/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/protocol.h/1.6/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/proxyd.c/1.201/Fri Apr  7 19:58:26 2006//Tcyrus-imapd-2_2-tail
+/pushstats.snmp/1.10/Wed Mar  6 20:49:03 2002//Tcyrus-imapd-2_2-tail
+/quota.c/1.65/Fri May 27 16:49:13 2005//Tcyrus-imapd-2_2-tail
+/quota.h/1.2/Fri Feb 27 17:44:56 2004//Tcyrus-imapd-2_2-tail
+/quota_db.c/1.2/Sat May 22 03:45:52 2004//Tcyrus-imapd-2_2-tail
+/reconstruct.c/1.88/Mon Oct 11 14:01:24 2004//Tcyrus-imapd-2_2-tail
+/saslclient.c/1.14/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/saslclient.h/1.2/Wed Oct 22 18:02:59 2003//Tcyrus-imapd-2_2-tail
+/saslserver.c/1.9/Wed Aug  4 13:03:17 2004//Tcyrus-imapd-2_2-tail
+/search_engines.c/1.5/Wed Apr 23 18:07:48 2003//Tcyrus-imapd-2_2-tail
+/search_engines.h/1.2/Thu Feb 13 20:15:30 2003//Tcyrus-imapd-2_2-tail
+/seen.h/1.14/Wed Oct 22 18:50:08 2003//Tcyrus-imapd-2_2-tail
+/seen_bigdb.c/1.10/Mon Dec 15 16:04:33 2003//Tcyrus-imapd-2_2-tail
+/seen_db.c/1.48/Fri Jun 18 19:03:50 2004//Tcyrus-imapd-2_2-tail
+/seen_local.c/1.43/Mon Feb 14 06:39:57 2005//Tcyrus-imapd-2_2-tail
+/setproctitle.c/1.16/Thu Feb 13 20:15:30 2003//Tcyrus-imapd-2_2-tail
+/signals.c/1.13/Mon Feb 14 16:26:50 2005//Tcyrus-imapd-2_2-tail
+/signals.h/1.1/Fri Dec 17 16:32:22 2004//Tcyrus-imapd-2_2-tail
+/smmapd.c/1.13/Wed Apr 13 15:42:04 2005//Tcyrus-imapd-2_2-tail
+/smtpclient.c/1.2/Wed Oct 22 18:02:59 2003//Tcyrus-imapd-2_2-tail
+/smtpclient.h/1.2/Wed Oct 22 18:02:59 2003//Tcyrus-imapd-2_2-tail
+/spool.c/1.8/Mon Oct 24 12:57:59 2005//Tcyrus-imapd-2_2-tail
+/spool.h/1.4/Thu Mar  4 16:09:35 2004//Tcyrus-imapd-2_2-tail
+/squat.c/1.7/Fri Feb 27 17:44:56 2004//Tcyrus-imapd-2_2-tail
+/squat.h/1.2/Thu Feb 13 20:15:31 2003//Tcyrus-imapd-2_2-tail
+/squat_build.c/1.10/Wed Dec 15 16:41:38 2004//Tcyrus-imapd-2_2-tail
+/squat_internal.c/1.2/Thu Feb 13 20:15:31 2003//Tcyrus-imapd-2_2-tail
+/squat_internal.h/1.2/Thu Feb 13 20:15:31 2003//Tcyrus-imapd-2_2-tail
+/squatter.c/1.15/Sat May 22 03:45:52 2004//Tcyrus-imapd-2_2-tail
+/syncnews.c/1.26/Sat May 22 03:45:52 2004//Tcyrus-imapd-2_2-tail
+/telemetry.c/1.8/Wed Oct 22 18:50:08 2003//Tcyrus-imapd-2_2-tail
+/telemetry.h/1.3/Tue Jul 22 19:17:20 2003//Tcyrus-imapd-2_2-tail
+/tls.c/1.51/Fri Oct 28 14:45:19 2005//Tcyrus-imapd-2_2-tail
+/tls.h/1.18/Wed Oct 22 18:50:09 2003//Tcyrus-imapd-2_2-tail
+/tls_prune.c/1.6/Mon Jan 26 17:46:58 2004//Tcyrus-imapd-2_2-tail
+/user.c/1.20/Tue Jun 22 16:59:17 2004//Tcyrus-imapd-2_2-tail
+/user.h/1.6/Wed Oct 22 18:50:09 2003//Tcyrus-imapd-2_2-tail
+/version.c/1.19/Wed Feb 16 20:37:58 2005//Tcyrus-imapd-2_2-tail
+/version.h/1.140/Wed Mar 29 19:08:06 2006//Tcyrus-imapd-2_2-tail
+/xversion.sh/1.7/Wed Oct 22 18:03:00 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/imap/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imap/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imap/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/imap/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/imtest/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
-/.cvsignore/1.3/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.30/Thu Feb  9 19:29:40 2006//
-/imtest.c/1.109/Tue Oct  3 18:40:42 2006//
+/.cvsignore/1.3/Wed Oct 22 18:03:01 2003//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.30/Fri May 28 18:03:03 2004//Tcyrus-imapd-2_2-tail
+/imtest.c/1.109/Wed Aug 30 16:58:49 2006//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/imtest/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/imtest/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/imtest/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/imtest/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/installsieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/installsieve/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/installsieve/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/installsieve/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,13 +1,13 @@
-/Makefile.in/1.13/Thu Feb  9 19:29:40 2006//
-/codes.h/1.4/Thu Feb  9 19:29:40 2006//
-/exitcodes.h/1.4/Thu Feb  9 19:29:40 2006//
-/installscript.c/1.29/Thu Feb  9 19:29:40 2006//
-/isieve.c/1.5/Thu Feb  9 19:29:40 2006//
-/isieve.h/1.5/Thu Feb  9 19:29:40 2006//
-/lex.c/1.11/Thu Feb  9 19:29:40 2006//
-/lex.h/1.8/Thu Feb  9 19:29:40 2006//
-/mystring.c/1.6/Thu Feb  9 19:29:40 2006//
-/mystring.h/1.6/Thu Feb  9 19:29:40 2006//
-/request.c/1.19/Thu Feb  9 19:29:40 2006//
-/request.h/1.13/Thu Feb  9 19:29:40 2006//
+/Makefile.in/1.13/Wed Oct 22 18:50:11 2003//Tcyrus-imapd-2_2-tail
+/codes.h/1.4/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/exitcodes.h/1.4/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/installscript.c/1.29/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/isieve.c/1.5/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/isieve.h/1.5/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/lex.c/1.11/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/lex.h/1.8/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/mystring.c/1.6/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/mystring.h/1.6/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/request.c/1.19/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
+/request.h/1.13/Thu Feb 13 20:15:37 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/installsieve/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/installsieve/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/installsieve/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/installsieve/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/lib/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/lib/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,97 +1,97 @@
+/.cvsignore/1.2/Wed Oct 22 18:03:03 2003//Tcyrus-imapd-2_2-tail
+/Makefile.dist/1.2/Wed Oct 22 18:03:03 2003//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.64/Tue Jan 10 23:18:48 2006//Tcyrus-imapd-2_2-tail
+/acl.c/1.10/Thu Feb 13 20:15:38 2003//Tcyrus-imapd-2_2-tail
+/acl.h/1.17/Mon Nov 13 16:17:53 2006//Tcyrus-imapd-2_2-tail
+/acl_afs.c/1.25/Thu Apr 13 18:34:52 2006//Tcyrus-imapd-2_2-tail
+/assert.c/1.18/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/assert.h/1.10/Thu Feb 13 20:15:38 2003//Tcyrus-imapd-2_2-tail
+/auth.c/1.1/Wed Feb 16 20:38:01 2005//Tcyrus-imapd-2_2-tail
+/auth.h/1.16/Wed Feb 16 20:38:01 2005//Tcyrus-imapd-2_2-tail
+/auth_krb.c/1.41/Wed Feb 16 20:38:01 2005//Tcyrus-imapd-2_2-tail
+/auth_krb5.c/1.4/Wed Feb 16 20:38:01 2005//Tcyrus-imapd-2_2-tail
+/auth_pts.c/1.9/Fri Jan 20 20:34:07 2006//Tcyrus-imapd-2_2-tail
+/auth_pts.h/1.2/Wed Oct 22 18:03:04 2003//Tcyrus-imapd-2_2-tail
+/auth_unix.c/1.39/Wed Feb 16 20:38:01 2005//Tcyrus-imapd-2_2-tail
+/bsearch.c/1.19/Thu Feb 13 20:15:39 2003//Tcyrus-imapd-2_2-tail
+/bsearch.h/1.7/Thu Feb 13 20:15:39 2003//Tcyrus-imapd-2_2-tail
+/charset.c/1.45/Wed Jun 14 12:44:05 2006//Tcyrus-imapd-2_2-tail
+/charset.h/1.19/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/chartable.h/1.5/Thu Feb 13 20:15:39 2003//Tcyrus-imapd-2_2-tail
+/cyrusdb.c/1.10/Wed Jan  4 02:06:23 2006//Tcyrus-imapd-2_2-tail
+/cyrusdb.h/1.30/Wed Jan  4 02:06:23 2006//Tcyrus-imapd-2_2-tail
+/cyrusdb_berkeley.c/1.14/Fri Mar 17 16:12:32 2006//Tcyrus-imapd-2_2-tail
+/cyrusdb_flat.c/1.35/Thu Mar 11 18:36:45 2004//Tcyrus-imapd-2_2-tail
+/cyrusdb_quotalegacy.c/1.12/Wed Apr 20 18:46:09 2005//Tcyrus-imapd-2_2-tail
+/cyrusdb_skiplist.c/1.50/Tue Jun  8 19:55:17 2004//Tcyrus-imapd-2_2-tail
+/exitcodes.h/1.5/Thu Feb 13 20:15:39 2003//Tcyrus-imapd-2_2-tail
+/ftruncate.c/1.8/Thu Feb 13 20:15:39 2003//Tcyrus-imapd-2_2-tail
+/gai.h/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/getaddrinfo.c/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/getdtablesize.c/1.7/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/getnameinfo.c/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/glob.c/1.31/Mon Dec  8 20:57:13 2003//Tcyrus-imapd-2_2-tail
+/glob.h/1.12/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/gmtoff.h/1.6/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/gmtoff_gmtime.c/1.11/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/gmtoff_tm.c/1.10/Fri Feb 27 18:17:33 2004//Tcyrus-imapd-2_2-tail
+/hash.c/1.12/Mon May 24 14:32:34 2004//Tcyrus-imapd-2_2-tail
+/hash.h/1.9/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/imapoptions/1.38/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/imapurl.c/1.11/Wed May  5 22:34:18 2004//Tcyrus-imapd-2_2-tail
+/imapurl.h/1.5/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/imclient.c/1.86/Fri Oct 28 14:45:22 2005//Tcyrus-imapd-2_2-tail
+/imclient.h/1.27/Mon Apr 11 05:48:25 2005//Tcyrus-imapd-2_2-tail
+/imparse.c/1.12/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/imparse.h/1.7/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/iptostring.c/1.7/Tue Mar  9 18:08:43 2004//Tcyrus-imapd-2_2-tail
+/iptostring.h/1.3/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/libconfig.c/1.10/Wed Mar 23 19:44:59 2005//Tcyrus-imapd-2_2-tail
+/libconfig.h/1.4/Mon Dec 29 20:22:55 2003//Tcyrus-imapd-2_2-tail
+/libcyr_cfg.c/1.12/Wed Mar 23 19:44:59 2005//Tcyrus-imapd-2_2-tail
+/libcyr_cfg.h/1.9/Wed Mar 23 19:44:59 2005//Tcyrus-imapd-2_2-tail
+/lock.h/1.7/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/lock_fcntl.c/1.16/Thu Feb 13 20:15:40 2003//Tcyrus-imapd-2_2-tail
+/lock_flock.c/1.15/Thu Feb 13 20:15:41 2003//Tcyrus-imapd-2_2-tail
+/lsort.c/1.2/Sat May 25 19:57:47 2002//Tcyrus-imapd-2_2-tail
+/lsort.h/1.2/Sat May 25 19:57:47 2002//Tcyrus-imapd-2_2-tail
+/map.h/1.12/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/map_nommap.c/1.23/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/map_shared.c/1.21/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/map_stupidshared.c/1.14/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/memmove.c/1.8/Thu Feb 13 20:15:41 2003//Tcyrus-imapd-2_2-tail
+/mkchartable.c/1.25/Wed May 14 18:56:34 2003//Tcyrus-imapd-2_2-tail
+/mkgmtime.c/1.10/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/mkgmtime.h/1.5/Thu Feb 13 20:15:41 2003//Tcyrus-imapd-2_2-tail
+/mpool.c/1.15/Tue Jan 10 18:14:53 2006//Tcyrus-imapd-2_2-tail
+/mpool.h/1.11/Tue Jan 10 18:14:53 2006//Tcyrus-imapd-2_2-tail
+/nonblock.h/1.8/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/nonblock_fcntl.c/1.15/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/nonblock_ioctl.c/1.11/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/parseaddr.c/1.17/Thu Feb 13 20:15:41 2003//Tcyrus-imapd-2_2-tail
+/parseaddr.h/1.8/Thu Feb 13 20:15:41 2003//Tcyrus-imapd-2_2-tail
+/prot.c/1.86/Fri Feb 27 22:08:56 2004//Tcyrus-imapd-2_2-tail
+/prot.h/1.42/Tue Jun 22 17:07:02 2004//Tcyrus-imapd-2_2-tail
+/retry.c/1.22/Mon Dec 29 21:25:42 2003//Tcyrus-imapd-2_2-tail
+/retry.h/1.12/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/rfc822date.c/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-imapd-2_2-tail
+/rfc822date.h/1.3/Thu Feb 13 20:15:42 2003//Tcyrus-imapd-2_2-tail
+/strcasecmp.c/1.6/Thu Feb 13 20:15:42 2003//Tcyrus-imapd-2_2-tail
+/strerror.c/1.6/Thu Feb 13 20:15:42 2003//Tcyrus-imapd-2_2-tail
+/strhash.c/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-imapd-2_2-tail
+/strhash.h/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-imapd-2_2-tail
+/stristr.c/1.3/Sat May 25 19:57:47 2002//Tcyrus-imapd-2_2-tail
+/stristr.h/1.2/Sat May 25 19:57:47 2002//Tcyrus-imapd-2_2-tail
+/sysexits.h/1.4/Thu Feb 13 20:15:42 2003//Tcyrus-imapd-2_2-tail
+/util.c/1.30/Thu Sep  9 16:22:01 2004//Tcyrus-imapd-2_2-tail
+/util.h/1.18/Fri Sep 10 13:38:41 2004//Tcyrus-imapd-2_2-tail
+/wildmat.c/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-imapd-2_2-tail
+/wildmat.h/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-imapd-2_2-tail
+/xmalloc.c/1.30/Tue Jan 10 23:18:48 2006//Tcyrus-imapd-2_2-tail
+/xmalloc.h/1.26/Tue Jan 10 23:18:48 2006//Tcyrus-imapd-2_2-tail
+/xstrlcat.c/1.1/Tue Jan 10 23:18:48 2006//Tcyrus-imapd-2_2-tail
+/xstrlcat.h/1.1/Tue Jan 10 23:18:48 2006//Tcyrus-imapd-2_2-tail
+/xstrlcpy.c/1.1/Tue Jan 10 23:18:48 2006//Tcyrus-imapd-2_2-tail
+/xstrlcpy.h/1.1/Tue Jan 10 23:18:48 2006//Tcyrus-imapd-2_2-tail
 D/charset////
 D/test////
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile.dist/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.64/Thu Feb  9 19:29:40 2006//
-/acl.c/1.10/Thu Feb  9 19:29:40 2006//
-/acl_afs.c/1.25/Wed May  3 15:43:58 2006//
-/assert.c/1.18/Thu Feb  9 19:29:40 2006//
-/assert.h/1.10/Thu Feb  9 19:29:40 2006//
-/auth.c/1.1/Thu Feb  9 19:29:40 2006//
-/auth.h/1.16/Thu Feb  9 19:29:40 2006//
-/auth_krb.c/1.41/Thu Feb  9 19:29:40 2006//
-/auth_krb5.c/1.4/Thu Feb  9 19:29:40 2006//
-/auth_pts.c/1.9/Thu Feb  9 19:29:40 2006//
-/auth_pts.h/1.2/Thu Feb  9 19:29:40 2006//
-/auth_unix.c/1.39/Thu Feb  9 19:29:40 2006//
-/bsearch.c/1.19/Thu Feb  9 19:29:40 2006//
-/bsearch.h/1.7/Thu Feb  9 19:29:40 2006//
-/charset.c/1.45/Sun Aug  6 18:00:40 2006//
-/charset.h/1.19/Thu Feb  9 19:29:40 2006//
-/chartable.h/1.5/Thu Feb  9 19:29:40 2006//
-/cyrusdb.c/1.10/Thu Feb  9 19:29:40 2006//
-/cyrusdb.h/1.30/Thu Feb  9 19:29:40 2006//
-/cyrusdb_berkeley.c/1.14/Wed May  3 15:43:58 2006//
-/cyrusdb_flat.c/1.35/Thu Feb  9 19:29:40 2006//
-/cyrusdb_quotalegacy.c/1.12/Thu Feb  9 19:29:40 2006//
-/cyrusdb_skiplist.c/1.50/Thu Feb  9 19:29:40 2006//
-/exitcodes.h/1.5/Thu Feb  9 19:29:40 2006//
-/ftruncate.c/1.8/Thu Feb  9 19:29:40 2006//
-/gai.h/1.6/Thu Feb  9 19:29:40 2006//
-/getaddrinfo.c/1.6/Thu Feb  9 19:29:40 2006//
-/getdtablesize.c/1.7/Thu Feb  9 19:29:40 2006//
-/getnameinfo.c/1.6/Thu Feb  9 19:29:40 2006//
-/glob.c/1.31/Thu Feb  9 19:29:40 2006//
-/glob.h/1.12/Thu Feb  9 19:29:40 2006//
-/gmtoff.h/1.6/Thu Feb  9 19:29:40 2006//
-/gmtoff_gmtime.c/1.11/Thu Feb  9 19:29:40 2006//
-/gmtoff_tm.c/1.10/Thu Feb  9 19:29:40 2006//
-/hash.c/1.12/Thu Feb  9 19:29:40 2006//
-/hash.h/1.9/Thu Feb  9 19:29:40 2006//
-/imapoptions/1.38/Thu Aug 31 11:01:30 2006//T1.38
-/imapurl.c/1.11/Thu Feb  9 19:29:40 2006//
-/imapurl.h/1.5/Thu Feb  9 19:29:40 2006//
-/imclient.c/1.86/Thu Feb  9 19:29:40 2006//
-/imclient.h/1.27/Thu Feb  9 19:29:40 2006//
-/imparse.c/1.12/Thu Feb  9 19:29:40 2006//
-/imparse.h/1.7/Thu Feb  9 19:29:40 2006//
-/iptostring.c/1.7/Thu Feb  9 19:29:40 2006//
-/iptostring.h/1.3/Thu Feb  9 19:29:40 2006//
-/libconfig.c/1.10/Thu Feb  9 19:29:40 2006//
-/libconfig.h/1.4/Thu Feb  9 19:29:40 2006//
-/libcyr_cfg.c/1.12/Thu Feb  9 19:29:40 2006//
-/libcyr_cfg.h/1.9/Thu Feb  9 19:29:40 2006//
-/lock.h/1.7/Thu Feb  9 19:29:40 2006//
-/lock_fcntl.c/1.16/Thu Feb  9 19:29:40 2006//
-/lock_flock.c/1.15/Thu Feb  9 19:29:40 2006//
-/lsort.c/1.2/Thu Feb  9 19:29:40 2006//
-/lsort.h/1.2/Thu Feb  9 19:29:40 2006//
-/map.h/1.12/Thu Feb  9 19:29:40 2006//
-/map_nommap.c/1.23/Thu Feb  9 19:29:40 2006//
-/map_shared.c/1.21/Thu Feb  9 19:29:40 2006//
-/map_stupidshared.c/1.14/Thu Feb  9 19:29:40 2006//
-/memmove.c/1.8/Thu Feb  9 19:29:40 2006//
-/mkchartable.c/1.25/Thu Feb  9 19:29:40 2006//
-/mkgmtime.c/1.10/Thu Feb  9 19:29:40 2006//
-/mkgmtime.h/1.5/Thu Feb  9 19:29:40 2006//
-/mpool.c/1.15/Thu Feb  9 19:29:40 2006//
-/mpool.h/1.11/Thu Feb  9 19:29:40 2006//
-/nonblock.h/1.8/Thu Feb  9 19:29:40 2006//
-/nonblock_fcntl.c/1.15/Thu Feb  9 19:29:40 2006//
-/nonblock_ioctl.c/1.11/Thu Feb  9 19:29:40 2006//
-/parseaddr.c/1.17/Thu Feb  9 19:29:40 2006//
-/parseaddr.h/1.8/Thu Feb  9 19:29:40 2006//
-/prot.c/1.86/Thu Feb  9 19:29:40 2006//
-/prot.h/1.42/Thu Feb  9 19:29:40 2006//
-/retry.c/1.22/Thu Feb  9 19:29:40 2006//
-/retry.h/1.12/Thu Feb  9 19:29:40 2006//
-/rfc822date.c/1.6/Thu Feb  9 19:29:40 2006//
-/rfc822date.h/1.3/Thu Feb  9 19:29:40 2006//
-/strcasecmp.c/1.6/Thu Feb  9 19:29:40 2006//
-/strerror.c/1.6/Thu Feb  9 19:29:40 2006//
-/strhash.c/1.2/Thu Feb  9 19:29:40 2006//
-/strhash.h/1.2/Thu Feb  9 19:29:40 2006//
-/stristr.c/1.3/Thu Feb  9 19:29:40 2006//
-/stristr.h/1.2/Thu Feb  9 19:29:40 2006//
-/sysexits.h/1.4/Thu Feb  9 19:29:40 2006//
-/util.c/1.30/Thu Feb  9 19:29:40 2006//
-/util.h/1.18/Thu Feb  9 19:29:40 2006//
-/wildmat.c/1.2/Thu Feb  9 19:29:40 2006//
-/wildmat.h/1.2/Thu Feb  9 19:29:40 2006//
-/xmalloc.c/1.30/Thu Feb  9 19:29:40 2006//
-/xmalloc.h/1.26/Thu Feb  9 19:29:40 2006//
-/xstrlcat.c/1.1/Thu Feb  9 19:29:40 2006//
-/xstrlcat.h/1.1/Thu Feb  9 19:29:40 2006//
-/xstrlcpy.c/1.1/Thu Feb  9 19:29:40 2006//
-/xstrlcpy.h/1.1/Thu Feb  9 19:29:40 2006//
-/acl.h/1.17/Mon Nov 13 18:06:49 2006//

Added: branches/cvsmerge/cyrus-cvs/lib/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/lib/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,21 +1,21 @@
-/big5.t/1.1/Thu Feb  9 19:29:40 2006//
-/gb2312.t/1.1/Thu Feb  9 19:29:40 2006//
-/iso-2022-jp.t/1.5/Thu Feb  9 19:29:40 2006//
-/iso-2022-kr.t/1.1/Thu Feb  9 19:29:40 2006//
-/iso-8859-1.t/1.5/Thu Feb  9 19:29:40 2006//
-/iso-8859-15.t/1.2/Thu Feb  9 19:29:40 2006//
-/iso-8859-2.t/1.4/Thu Feb  9 19:29:40 2006//
-/iso-8859-3.t/1.4/Thu Feb  9 19:29:40 2006//
-/iso-8859-4.t/1.5/Thu Feb  9 19:29:40 2006//
-/iso-8859-5.t/1.4/Thu Feb  9 19:29:40 2006//
-/iso-8859-6.t/1.5/Thu Feb  9 19:29:40 2006//
-/iso-8859-7.t/1.5/Thu Feb  9 19:29:40 2006//
-/iso-8859-8.t/1.4/Thu Feb  9 19:29:40 2006//
-/iso-8859-9.t/1.5/Thu Feb  9 19:29:40 2006//
-/koi8-r.t/1.4/Thu Feb  9 19:29:40 2006//
-/unidata2.txt/1.1/Thu Feb  9 19:29:40 2006//
-/unifix.txt/1.3/Thu Feb  9 19:29:40 2006//
-/us-ascii.t/1.4/Thu Feb  9 19:29:40 2006//
-/windows-1252.t/1.2/Thu Feb  9 19:29:40 2006//
-/windows-1256.t/1.1/Thu Feb  9 19:29:40 2006//
+/big5.t/1.1/Tue Mar  2 01:06:37 1999//Tcyrus-imapd-2_2-tail
+/gb2312.t/1.1/Tue Mar  2 01:06:39 1999//Tcyrus-imapd-2_2-tail
+/iso-2022-jp.t/1.5/Fri May 15 21:53:45 1998//Tcyrus-imapd-2_2-tail
+/iso-2022-kr.t/1.1/Tue Mar  2 01:06:40 1999//Tcyrus-imapd-2_2-tail
+/iso-8859-1.t/1.5/Fri May 15 21:53:49 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-15.t/1.2/Wed Jan 29 20:48:53 2003//Tcyrus-imapd-2_2-tail
+/iso-8859-2.t/1.4/Fri May 15 21:53:53 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-3.t/1.4/Fri May 15 21:53:57 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-4.t/1.5/Fri May 15 21:54:00 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-5.t/1.4/Fri May 15 21:54:04 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-6.t/1.5/Fri May 15 21:54:07 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-7.t/1.5/Fri May 15 21:54:11 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-8.t/1.4/Fri May 15 21:54:14 1998//Tcyrus-imapd-2_2-tail
+/iso-8859-9.t/1.5/Fri May 15 21:54:18 1998//Tcyrus-imapd-2_2-tail
+/koi8-r.t/1.4/Fri May 15 21:54:21 1998//Tcyrus-imapd-2_2-tail
+/unidata2.txt/1.1/Tue Mar  2 01:08:06 1999//Tcyrus-imapd-2_2-tail
+/unifix.txt/1.3/Wed Mar  9 16:08:42 2005//Tcyrus-imapd-2_2-tail
+/us-ascii.t/1.4/Fri May 15 21:54:29 1998//Tcyrus-imapd-2_2-tail
+/windows-1252.t/1.2/Wed Jan 29 20:48:53 2003//Tcyrus-imapd-2_2-tail
+/windows-1256.t/1.1/Wed May 14 18:56:36 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/lib/charset/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/lib/test/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/test/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/test/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/lib/test/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,15 +1,15 @@
-/Makefile/1.1/Thu Feb  9 19:29:40 2006//
-/cyrusdb.INPUT/1.3/Thu Feb  9 19:29:40 2006//
-/cyrusdb.OUTPUT/1.3/Thu Feb  9 19:29:40 2006//
-/cyrusdb.c/1.11/Thu Feb  9 19:29:40 2006//
-/cyrusdblong.INPUT/1.1/Thu Feb  9 19:29:40 2006//
-/cyrusdblong.OUTPUT/1.1/Thu Feb  9 19:29:40 2006//
-/cyrusdbtxn.INPUT/1.1/Thu Feb  9 19:29:40 2006//
-/cyrusdbtxn.OUTPUT/1.1/Thu Feb  9 19:29:40 2006//
-/imapurl.c/1.2/Thu Feb  9 19:29:40 2006//
-/pool.c/1.3/Thu Feb  9 19:29:40 2006//
-/rnddb.c/1.7/Thu Feb  9 19:29:40 2006//
-/run/1.13/Thu Feb  9 19:29:40 2006//
-/testglob.c/1.2/Thu Feb  9 19:29:40 2006//
-/testglob2.c/1.2/Thu Feb  9 19:29:40 2006//
+/Makefile/1.1/Wed May  5 21:40:32 2004//Tcyrus-imapd-2_2-tail
+/cyrusdb.INPUT/1.3/Thu Jan 24 21:55:56 2002//Tcyrus-imapd-2_2-tail
+/cyrusdb.OUTPUT/1.3/Thu Jan 24 21:58:41 2002//Tcyrus-imapd-2_2-tail
+/cyrusdb.c/1.11/Fri Jun  4 19:42:03 2004//Tcyrus-imapd-2_2-tail
+/cyrusdblong.INPUT/1.1/Wed Feb 20 19:40:28 2002//Tcyrus-imapd-2_2-tail
+/cyrusdblong.OUTPUT/1.1/Wed Feb 20 19:40:28 2002//Tcyrus-imapd-2_2-tail
+/cyrusdbtxn.INPUT/1.1/Thu Jan 24 23:12:35 2002//Tcyrus-imapd-2_2-tail
+/cyrusdbtxn.OUTPUT/1.1/Thu Jan 24 23:12:35 2002//Tcyrus-imapd-2_2-tail
+/imapurl.c/1.2/Sat May 22 03:43:30 2004//Tcyrus-imapd-2_2-tail
+/pool.c/1.3/Tue Nov 26 18:21:24 2002//Tcyrus-imapd-2_2-tail
+/rnddb.c/1.7/Mon Dec 15 16:04:35 2003//Tcyrus-imapd-2_2-tail
+/run/1.13/Wed Oct 22 18:03:06 2003//Tcyrus-imapd-2_2-tail
+/testglob.c/1.2/Mon Dec  8 20:26:45 2003//Tcyrus-imapd-2_2-tail
+/testglob2.c/1.2/Mon Dec  8 20:26:45 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/lib/test/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/lib/test/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/lib/test/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/lib/test/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/makedepend/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/makedepend/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/makedepend/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/makedepend/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,15 +1,15 @@
-/Makefile.in/1.7/Thu Feb  9 19:29:40 2006//
-/configure/1.2/Thu Feb  9 19:29:40 2006//
-/configure.in/1.1/Thu Feb  9 19:29:40 2006//
-/cpp.ed/1.1/Thu Feb  9 19:29:40 2006//
-/cppsetup.c/1.3/Thu Feb  9 19:29:40 2006//
-/def.h/1.3/Thu Feb  9 19:29:40 2006//
-/ifparser.c/1.3/Thu Feb  9 19:29:40 2006//
-/ifparser.h/1.3/Thu Feb  9 19:29:40 2006//
-/include.c/1.3/Thu Feb  9 19:29:40 2006//
-/install-sh/1.2/Thu Feb  9 19:29:40 2006//
-/main.c/1.5/Thu Feb  9 19:29:40 2006//
-/mkdepend.man/1.1/Thu Feb  9 19:29:40 2006//
-/parse.c/1.3/Thu Feb  9 19:29:40 2006//
-/pr.c/1.3/Thu Feb  9 19:29:40 2006//
+/Makefile.in/1.7/Tue May 23 20:56:21 2000//Tcyrus-imapd-2_2-tail
+/configure/1.2/Tue May 23 20:56:21 2000//Tcyrus-imapd-2_2-tail
+/configure.in/1.1/Wed Jul  5 19:27:31 1995//Tcyrus-imapd-2_2-tail
+/cpp.ed/1.1/Wed Jul  5 18:49:33 1995//Tcyrus-imapd-2_2-tail
+/cppsetup.c/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-imapd-2_2-tail
+/def.h/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-imapd-2_2-tail
+/ifparser.c/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-imapd-2_2-tail
+/ifparser.h/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-imapd-2_2-tail
+/include.c/1.3/Thu Feb 13 20:15:44 2003//Tcyrus-imapd-2_2-tail
+/install-sh/1.2/Tue May 23 20:56:22 2000//Tcyrus-imapd-2_2-tail
+/main.c/1.5/Thu Feb 13 20:15:44 2003//Tcyrus-imapd-2_2-tail
+/mkdepend.man/1.1/Wed Jul  5 18:49:33 1995//Tcyrus-imapd-2_2-tail
+/parse.c/1.3/Thu Feb 13 20:15:44 2003//Tcyrus-imapd-2_2-tail
+/pr.c/1.3/Thu Feb 13 20:15:44 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/makedepend/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/makedepend/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/makedepend/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/makedepend/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/man/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/man/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/man/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/man/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,43 +1,43 @@
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile.dist/1.1/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.35/Thu Feb  9 19:29:40 2006//
-/arbitron.8/1.14/Thu Feb  9 19:29:40 2006//
-/chk_cyrus.8/1.4/Sun Aug  6 18:12:47 2006//
-/ctl_cyrusdb.8/1.6/Thu Feb  9 19:29:40 2006//
-/ctl_deliver.8/1.9/Thu Feb  9 19:29:40 2006//
-/ctl_mboxlist.8/1.9/Wed May  3 15:43:58 2006//
-/cvt_cyrusdb.8/1.3/Thu Feb  9 19:29:40 2006//
-/cyr_expire.8/1.2/Thu Feb  9 19:29:40 2006//
-/cyrus.conf.5/1.12/Thu Feb  9 19:29:40 2006//
-/deliver.8/1.18/Thu Feb  9 19:29:40 2006//
-/fetchnews.8/1.4/Thu Feb  9 19:29:40 2006//
-/fud.8/1.11/Thu Feb  9 19:29:40 2006//
-/idled.8/1.4/Thu Feb  9 19:29:40 2006//
-/imapd.8/1.15/Thu Feb  9 19:29:40 2006//
-/imclient.3/1.11/Thu Feb  9 19:29:40 2006//
-/imtest.1/1.14/Thu Feb  9 19:29:40 2006//
-/installsieve.1/1.5/Thu Feb  9 19:29:40 2006//
-/ipurge.8/1.8/Thu Feb  9 19:29:40 2006//
-/krb.equiv.5/1.10/Thu Feb  9 19:29:40 2006//
-/lmtpd.8/1.6/Thu Feb  9 19:29:40 2006//
-/lmtptest.1/1.7/Thu Feb  9 19:29:40 2006//
-/master.8/1.13/Thu Feb  9 19:29:40 2006//
-/mbexamine.8/1.3/Thu Feb  9 19:29:40 2006//
-/mbpath.8/1.5/Thu Feb  9 19:29:40 2006//
-/mupdatetest.1/1.6/Thu Feb  9 19:29:40 2006//
-/nntpd.8/1.2/Thu Feb  9 19:29:40 2006//
-/nntptest.1/1.3/Thu Feb  9 19:29:40 2006//
-/notifyd.8/1.7/Thu Feb  9 19:29:40 2006//
-/pop3d.8/1.13/Thu Feb  9 19:29:40 2006//
-/pop3test.1/1.10/Thu Feb  9 19:29:40 2006//
-/quota.8/1.11/Thu Feb  9 19:29:40 2006//
-/reconstruct.8/1.20/Sun Aug  6 18:12:47 2006//
-/rmnews.8/1.7/Thu Feb  9 19:29:40 2006//
-/sivtest.1/1.6/Thu Feb  9 19:29:40 2006//
-/smmapd.8/1.2/Thu Feb  9 19:29:40 2006//
-/smtptest.1/1.6/Thu Feb  9 19:29:40 2006//
-/squatter.8/1.6/Thu Feb  9 19:29:40 2006//
-/syncnews.8/1.9/Thu Feb  9 19:29:40 2006//
-/timsieved.8/1.6/Thu Feb  9 19:29:40 2006//
-/tls_prune.8/1.3/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.2/Wed Oct 22 18:03:08 2003//Tcyrus-imapd-2_2-tail
+/Makefile.dist/1.1/Mon Mar  1 19:52:43 2004//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.35/Tue Mar 30 15:18:41 2004//Tcyrus-imapd-2_2-tail
+/arbitron.8/1.14/Fri Jan 13 16:47:19 2006//Tcyrus-imapd-2_2-tail
+/chk_cyrus.8/1.4/Mon Jun 19 13:05:54 2006//Tcyrus-imapd-2_2-tail
+/ctl_cyrusdb.8/1.6/Sat Aug  9 23:43:14 2003//Tcyrus-imapd-2_2-tail
+/ctl_deliver.8/1.9/Wed Oct 22 18:50:13 2003//Tcyrus-imapd-2_2-tail
+/ctl_mboxlist.8/1.9/Thu Apr  6 15:33:09 2006//Tcyrus-imapd-2_2-tail
+/cvt_cyrusdb.8/1.3/Sat Aug  9 23:43:14 2003//Tcyrus-imapd-2_2-tail
+/cyr_expire.8/1.2/Wed Oct 22 18:03:08 2003//Tcyrus-imapd-2_2-tail
+/cyrus.conf.5/1.12/Mon Feb  9 18:26:57 2004//Tcyrus-imapd-2_2-tail
+/deliver.8/1.18/Mon Jun 21 18:40:10 2004//Tcyrus-imapd-2_2-tail
+/fetchnews.8/1.4/Wed Mar 23 00:40:16 2005//Tcyrus-imapd-2_2-tail
+/fud.8/1.11/Wed Oct 22 18:50:13 2003//Tcyrus-imapd-2_2-tail
+/idled.8/1.4/Sat Aug  9 23:43:14 2003//Tcyrus-imapd-2_2-tail
+/imapd.8/1.15/Thu Oct  3 19:02:41 2002//Tcyrus-imapd-2_2-tail
+/imclient.3/1.11/Mon Apr 11 05:48:28 2005//Tcyrus-imapd-2_2-tail
+/imtest.1/1.14/Thu Dec 16 15:49:08 2004//Tcyrus-imapd-2_2-tail
+/installsieve.1/1.5/Sat May 25 19:57:48 2002//Tcyrus-imapd-2_2-tail
+/ipurge.8/1.8/Thu Nov 20 18:47:48 2003//Tcyrus-imapd-2_2-tail
+/krb.equiv.5/1.10/Wed Oct 22 18:50:13 2003//Tcyrus-imapd-2_2-tail
+/lmtpd.8/1.6/Thu Oct  3 19:02:41 2002//Tcyrus-imapd-2_2-tail
+/lmtptest.1/1.7/Thu Dec 16 15:49:08 2004//Tcyrus-imapd-2_2-tail
+/master.8/1.13/Fri Dec 17 16:32:23 2004//Tcyrus-imapd-2_2-tail
+/mbexamine.8/1.3/Sat Aug  9 23:43:14 2003//Tcyrus-imapd-2_2-tail
+/mbpath.8/1.5/Sat Aug  9 23:43:14 2003//Tcyrus-imapd-2_2-tail
+/mupdatetest.1/1.6/Thu Dec 16 15:49:08 2004//Tcyrus-imapd-2_2-tail
+/nntpd.8/1.2/Wed Oct 22 18:03:08 2003//Tcyrus-imapd-2_2-tail
+/nntptest.1/1.3/Thu Dec 16 15:49:08 2004//Tcyrus-imapd-2_2-tail
+/notifyd.8/1.7/Sat Aug  9 23:43:14 2003//Tcyrus-imapd-2_2-tail
+/pop3d.8/1.13/Thu Oct  3 19:02:41 2002//Tcyrus-imapd-2_2-tail
+/pop3test.1/1.10/Thu Dec 16 15:49:08 2004//Tcyrus-imapd-2_2-tail
+/quota.8/1.11/Wed Oct 22 18:50:13 2003//Tcyrus-imapd-2_2-tail
+/reconstruct.8/1.20/Mon Jun 19 13:01:19 2006//Tcyrus-imapd-2_2-tail
+/rmnews.8/1.7/Sat Aug  9 23:43:14 2003//Tcyrus-imapd-2_2-tail
+/sivtest.1/1.6/Thu Dec 16 15:49:08 2004//Tcyrus-imapd-2_2-tail
+/smmapd.8/1.2/Fri Nov  7 21:37:02 2003//Tcyrus-imapd-2_2-tail
+/smtptest.1/1.6/Thu Dec 16 15:49:09 2004//Tcyrus-imapd-2_2-tail
+/squatter.8/1.6/Wed Oct 22 18:50:13 2003//Tcyrus-imapd-2_2-tail
+/syncnews.8/1.9/Sat Aug  9 23:43:15 2003//Tcyrus-imapd-2_2-tail
+/timsieved.8/1.6/Sat May 25 19:57:48 2002//Tcyrus-imapd-2_2-tail
+/tls_prune.8/1.3/Sat Aug  9 23:43:15 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/man/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/man/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/man/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/man/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/master/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/master/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/master/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/master/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,14 +1,14 @@
+/.cvsignore/1.2/Wed Oct 22 18:03:09 2003//Tcyrus-imapd-2_2-tail
+/CYRUS-MASTER.mib/1.4/Tue Aug 14 16:11:26 2001//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.21/Fri Dec 17 16:32:24 2004//Tcyrus-imapd-2_2-tail
+/README/1.9/Wed Oct 22 18:03:09 2003//Tcyrus-imapd-2_2-tail
+/cyrusMasterMIB.c/1.12/Wed Oct 26 01:11:34 2005//Tcyrus-imapd-2_2-tail
+/cyrusMasterMIB.h/1.1/Sun Nov  5 22:11:28 2000//Tcyrus-imapd-2_2-tail
+/master.c/1.103/Mon Mar  7 15:45:41 2005//Tcyrus-imapd-2_2-tail
+/master.h/1.13/Fri Dec 17 16:32:24 2004//Tcyrus-imapd-2_2-tail
+/masterconf.c/1.12/Tue Nov 25 17:37:19 2003//Tcyrus-imapd-2_2-tail
+/masterconf.h/1.6/Wed Oct 22 18:50:14 2003//Tcyrus-imapd-2_2-tail
+/service-thread.c/1.19/Thu Dec  1 21:16:07 2005//Tcyrus-imapd-2_2-tail
+/service.c/1.54/Thu Dec  1 21:16:07 2005//Tcyrus-imapd-2_2-tail
+/service.h/1.16/Wed Oct 22 18:50:14 2003//Tcyrus-imapd-2_2-tail
 D/conf////
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/CYRUS-MASTER.mib/1.4/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.21/Thu Feb  9 19:29:40 2006//
-/README/1.9/Thu Feb  9 19:29:40 2006//
-/cyrusMasterMIB.c/1.12/Thu Feb  9 19:29:40 2006//
-/cyrusMasterMIB.h/1.1/Thu Feb  9 19:29:40 2006//
-/master.c/1.103/Thu Feb  9 19:29:40 2006//
-/master.h/1.13/Thu Feb  9 19:29:40 2006//
-/masterconf.c/1.12/Thu Feb  9 19:29:40 2006//
-/masterconf.h/1.6/Thu Feb  9 19:29:40 2006//
-/service-thread.c/1.19/Thu Feb  9 19:29:40 2006//
-/service.c/1.54/Thu Feb  9 19:29:40 2006//
-/service.h/1.16/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/master/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/master/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/master/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/master/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/master/conf/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/master/conf/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/master/conf/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/master/conf/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,6 +1,6 @@
-/cmu-backend.conf/1.3/Thu Feb  9 19:29:40 2006//
-/cmu-frontend.conf/1.2/Thu Feb  9 19:29:40 2006//
-/normal.conf/1.12/Wed May  3 15:43:58 2006//
-/prefork.conf/1.10/Thu Feb  9 19:29:40 2006//
-/small.conf/1.9/Thu Feb  9 19:29:40 2006//
+/cmu-backend.conf/1.3/Wed Oct 22 18:03:10 2003//Tcyrus-imapd-2_2-tail
+/cmu-frontend.conf/1.2/Wed Oct 22 18:03:10 2003//Tcyrus-imapd-2_2-tail
+/normal.conf/1.12/Thu Mar 30 16:01:39 2006//Tcyrus-imapd-2_2-tail
+/prefork.conf/1.10/Wed Oct 22 18:03:10 2003//Tcyrus-imapd-2_2-tail
+/small.conf/1.9/Tue Oct  1 20:46:01 2002//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/master/conf/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/master/conf/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/master/conf/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/master/conf/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/netnews/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/netnews/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/netnews/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/netnews/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,8 +1,8 @@
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.9/Thu Feb  9 19:29:40 2006//
-/inn.diffs/1.3/Thu Feb  9 19:29:40 2006//
-/macros.h/1.7/Thu Feb  9 19:29:40 2006//
-/readconfig.c/1.8/Thu Feb  9 19:29:40 2006//
-/readconfig.h/1.4/Thu Feb  9 19:29:40 2006//
-/remotepurge.c/1.18/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.2/Wed Oct 22 18:03:11 2003//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.9/Wed Nov 12 04:02:08 2003//Tcyrus-imapd-2_2-tail
+/inn.diffs/1.3/Sat May 25 19:57:49 2002//Tcyrus-imapd-2_2-tail
+/macros.h/1.7/Wed Oct 22 18:50:15 2003//Tcyrus-imapd-2_2-tail
+/readconfig.c/1.8/Wed Oct 22 18:50:15 2003//Tcyrus-imapd-2_2-tail
+/readconfig.h/1.4/Thu Feb 13 20:15:47 2003//Tcyrus-imapd-2_2-tail
+/remotepurge.c/1.18/Thu Feb 13 20:15:47 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/netnews/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/netnews/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/netnews/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/netnews/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/notifyd/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/notifyd/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/notifyd/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/notifyd/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,16 +1,16 @@
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.10/Thu Feb  9 19:29:40 2006//
-/exitcodes.h/1.2/Thu Feb  9 19:29:40 2006//
-/notify_log.c/1.7/Thu Feb  9 19:29:40 2006//
-/notify_log.h/1.5/Thu Feb  9 19:29:40 2006//
-/notify_mailto.c/1.11/Wed May  3 15:43:58 2006//
-/notify_mailto.h/1.5/Thu Feb  9 19:29:40 2006//
-/notify_null.c/1.6/Thu Feb  9 19:29:40 2006//
-/notify_null.h/1.5/Thu Feb  9 19:29:40 2006//
-/notify_zephyr.c/1.4/Thu Feb  9 19:29:40 2006//
-/notify_zephyr.h/1.3/Thu Feb  9 19:29:40 2006//
-/notifyd.c/1.19/Thu Feb  9 19:29:40 2006//
-/notifyd.h/1.2/Thu Feb  9 19:29:40 2006//
-/notifytest.c/1.10/Thu Feb  9 19:29:40 2006//
-/version.h/1.2/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.2/Wed Oct 22 18:03:13 2003//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.10/Fri May 28 18:03:06 2004//Tcyrus-imapd-2_2-tail
+/exitcodes.h/1.2/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notify_log.c/1.7/Wed Oct 22 18:50:16 2003//Tcyrus-imapd-2_2-tail
+/notify_log.h/1.5/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notify_mailto.c/1.11/Thu Mar 30 16:00:03 2006//Tcyrus-imapd-2_2-tail
+/notify_mailto.h/1.5/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notify_null.c/1.6/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notify_null.h/1.5/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notify_zephyr.c/1.4/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notify_zephyr.h/1.3/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notifyd.c/1.19/Wed Apr 13 15:42:05 2005//Tcyrus-imapd-2_2-tail
+/notifyd.h/1.2/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/notifytest.c/1.10/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
+/version.h/1.2/Thu Feb 13 20:15:48 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/notifyd/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/notifyd/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/notifyd/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/notifyd/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
+/.cvsignore/1.1/Sun Jan  6 02:03:32 2002//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.14/Wed Oct 22 18:50:17 2003//Tcyrus-imapd-2_2-tail
 D/imap////
 D/sieve////
-/.cvsignore/1.1/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.14/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/perl/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,15 +1,14 @@
-D/Cyrus////
+/.cvsignore/1.1/Sun Jan  6 02:03:32 2002//Tcyrus-imapd-2_2-tail
+/Changes/1.1/Wed May  3 17:30:54 2000//Tcyrus-imapd-2_2-tail
+/IMAP.pm/1.22/Mon Aug  8 15:09:09 2005//Tcyrus-imapd-2_2-tail
+/IMAP.xs/1.24/Tue Nov 25 21:28:23 2003//Tcyrus-imapd-2_2-tail
+/MANIFEST/1.3/Thu Dec  7 22:40:24 2000//Tcyrus-imapd-2_2-tail
+/Makefile.PL/1.17/Wed Oct 22 18:50:18 2003//Tcyrus-imapd-2_2-tail
+/README/1.3/Mon Nov 24 20:19:50 2003//Tcyrus-imapd-2_2-tail
+/cyradm.sh/1.17/Mon Nov 21 16:39:24 2005//Tcyrus-imapd-2_2-tail
+/cyrperl.h/1.7/Thu Feb 13 20:15:49 2003//Tcyrus-imapd-2_2-tail
+/typemap/1.2/Wed May  3 21:37:20 2000//Tcyrus-imapd-2_2-tail
+/xsutil.c/1.5/Thu Feb 13 20:15:49 2003//Tcyrus-imapd-2_2-tail
 D/IMAP////
 D/examples////
 D/t////
-/.cvsignore/1.1/Thu Feb  9 19:29:40 2006//
-/Changes/1.1/Thu Feb  9 19:29:40 2006//
-/IMAP.pm/1.22/Thu Feb  9 19:29:40 2006//
-/IMAP.xs/1.24/Thu Feb  9 19:29:40 2006//
-/MANIFEST/1.3/Thu Feb  9 19:29:40 2006//
-/Makefile.PL/1.17/Thu Feb  9 19:29:40 2006//
-/README/1.3/Thu Feb  9 19:29:40 2006//
-/cyradm.sh/1.17/Thu Feb  9 19:29:40 2006//
-/cyrperl.h/1.7/Thu Feb  9 19:29:40 2006//
-/typemap/1.2/Thu Feb  9 19:29:40 2006//
-/xsutil.c/1.5/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
-/Admin.pm/1.48/Thu Feb  9 19:29:40 2006//
-/IMSP.pm/1.3/Thu Feb  9 19:29:40 2006//
-/Shell.pm/1.37/Wed May  3 15:43:58 2006//
+/Admin.pm/1.48/Mon Nov 21 16:39:25 2005//Tcyrus-imapd-2_2-tail
+/IMSP.pm/1.3/Sat May 25 19:57:49 2002//Tcyrus-imapd-2_2-tail
+/Shell.pm/1.37/Thu Mar 23 15:41:56 2006//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/IMAP/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,5 +1,5 @@
-/auditmbox.pl/1.4/Thu Feb  9 19:29:40 2006//
-/imapcollate.pl/1.5/Thu Feb  9 19:29:40 2006//
-/imapdu.pl/1.8/Thu Feb  9 19:29:40 2006//
-/test-imsp.pl/1.2/Thu Feb  9 19:29:40 2006//
+/auditmbox.pl/1.4/Mon Nov 24 20:19:53 2003//Tcyrus-imapd-2_2-tail
+/imapcollate.pl/1.5/Sat May 25 19:57:50 2002//Tcyrus-imapd-2_2-tail
+/imapdu.pl/1.8/Fri Nov 30 19:30:45 2001//Tcyrus-imapd-2_2-tail
+/test-imsp.pl/1.2/Sat May 25 19:57:50 2002//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/examples/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,3 +1,3 @@
-/01-imclient.t/1.4/Thu Feb  9 19:29:40 2006//
-/02-admin.t/1.4/Thu Feb  9 19:29:40 2006//
+/01-imclient.t/1.4/Sat May 25 19:57:50 2002//Tcyrus-imapd-2_2-tail
+/02-admin.t/1.4/Sat May 25 19:57:50 2002//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/imap/t/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,6 +1,5 @@
-D/acap////
+/.cvsignore/1.1/Sun Jan  6 02:03:32 2002//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.16/Wed Oct 22 18:50:24 2003//Tcyrus-imapd-2_2-tail
 D/lib////
 D/managesieve////
 D/scripts////
-/.cvsignore/1.1/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.16/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,13 +1,13 @@
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.14/Thu Feb  9 19:29:40 2006//
-/codes.h/1.4/Thu Feb  9 19:29:40 2006//
-/exitcodes.h/1.3/Thu Feb  9 19:29:40 2006//
-/isieve.c/1.29/Thu Feb  9 19:29:40 2006//
-/isieve.h/1.10/Thu Feb  9 19:29:40 2006//
-/lex.c/1.7/Thu Feb  9 19:29:40 2006//
-/lex.h/1.7/Thu Feb  9 19:29:40 2006//
-/mystring.c/1.7/Thu Feb  9 19:29:40 2006//
-/mystring.h/1.5/Thu Feb  9 19:29:40 2006//
-/request.c/1.16/Thu Feb  9 19:29:40 2006//
-/request.h/1.7/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.2/Wed Oct 22 18:03:19 2003//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.14/Fri May 28 18:03:07 2004//Tcyrus-imapd-2_2-tail
+/codes.h/1.4/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/exitcodes.h/1.3/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/isieve.c/1.29/Thu Apr 21 21:03:49 2005//Tcyrus-imapd-2_2-tail
+/isieve.h/1.10/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/lex.c/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/lex.h/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/mystring.c/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/mystring.h/1.5/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/request.c/1.16/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
+/request.h/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/lib/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,8 +1,8 @@
-/.cvsignore/1.1/Thu Feb  9 19:29:40 2006//
-/MANIFEST/1.1/Thu Feb  9 19:29:40 2006//
-/Makefile.PL/1.13/Thu Feb  9 19:29:40 2006//
-/managesieve.h/1.5/Thu Feb  9 19:29:40 2006//
-/managesieve.pm/1.8/Thu Feb  9 19:29:40 2006//
-/managesieve.xs/1.22/Thu Feb  9 19:29:40 2006//
-/typemap/1.1/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.1/Sun Jan  6 02:03:32 2002//Tcyrus-imapd-2_2-tail
+/MANIFEST/1.1/Tue May  9 17:22:30 2000//Tcyrus-imapd-2_2-tail
+/Makefile.PL/1.13/Thu Oct 13 20:30:03 2005//Tcyrus-imapd-2_2-tail
+/managesieve.h/1.5/Thu Feb 13 20:15:55 2003//Tcyrus-imapd-2_2-tail
+/managesieve.pm/1.8/Sat May 25 19:57:51 2002//Tcyrus-imapd-2_2-tail
+/managesieve.xs/1.22/Thu Apr 21 18:38:10 2005//Tcyrus-imapd-2_2-tail
+/typemap/1.1/Wed May  3 17:31:02 2000//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/managesieve/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,3 +1,3 @@
-/installsieve.pl/1.7/Thu Feb  9 19:29:40 2006//
-/sieveshell.pl/1.23/Thu Feb  9 19:29:40 2006//
+/installsieve.pl/1.7/Sat May 25 19:57:52 2002//Tcyrus-imapd-2_2-tail
+/sieveshell.pl/1.23/Tue Jan  6 21:49:59 2004//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/perl/sieve/scripts/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/ptclient/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/ptclient/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/ptclient/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/ptclient/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,13 +1,13 @@
-/.cvsignore/1.3/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.28/Thu Feb  9 19:29:40 2006//
-/README/1.5/Thu Feb  9 19:29:40 2006//
-/afskrb.c/1.12/Thu Feb  9 19:29:40 2006//
-/ldap.c/1.9/Thu Feb  9 19:29:40 2006//
-/ptdump.c/1.12/Thu Feb  9 19:29:40 2006//
-/ptexpire.c/1.18/Thu Feb  9 19:29:40 2006//
-/ptextract.c/1.4/Thu Feb  9 19:29:40 2006//
-/ptloader.c/1.41/Thu Feb  9 19:29:40 2006//
-/ptloader.h/1.1/Thu Feb  9 19:29:40 2006//
-/test.c/1.6/Thu Feb  9 19:29:40 2006//
-/test2.c/1.6/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.3/Tue Mar  9 18:05:40 2004//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.28/Thu Feb 17 18:41:29 2005//Tcyrus-imapd-2_2-tail
+/README/1.5/Wed Oct 22 18:50:29 2003//Tcyrus-imapd-2_2-tail
+/afskrb.c/1.12/Thu Oct 13 20:37:10 2005//Tcyrus-imapd-2_2-tail
+/ldap.c/1.9/Thu May 12 19:49:55 2005//Tcyrus-imapd-2_2-tail
+/ptdump.c/1.12/Thu Mar 11 18:36:46 2004//Tcyrus-imapd-2_2-tail
+/ptexpire.c/1.18/Wed May 26 16:05:59 2004//Tcyrus-imapd-2_2-tail
+/ptextract.c/1.4/Thu Feb 13 20:15:56 2003//Tcyrus-imapd-2_2-tail
+/ptloader.c/1.41/Thu Oct 13 20:37:10 2005//Tcyrus-imapd-2_2-tail
+/ptloader.h/1.1/Wed Feb 16 20:38:04 2005//Tcyrus-imapd-2_2-tail
+/test.c/1.6/Wed Oct 22 18:50:29 2003//Tcyrus-imapd-2_2-tail
+/test2.c/1.6/Wed Oct 22 18:50:29 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/ptclient/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/ptclient/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/ptclient/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/ptclient/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,37 +1,37 @@
+/.cvsignore/1.2/Wed Oct 22 18:03:23 2003//Tcyrus-imapd-2_2-tail
+/AUTHORS/1.5/Tue Nov  2 12:37:30 2004//Tcyrus-imapd-2_2-tail
+/COPYING/1.1.1.1/Fri Jul  2 18:55:35 1999//Tcyrus-imapd-2_2-tail
+/ChangeLog/1.1.1.1/Fri Jul  2 18:55:35 1999//Tcyrus-imapd-2_2-tail
+/Makefile.dist/1.7/Mon Mar  1 19:47:36 2004//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.38/Fri May 28 18:03:09 2004//Tcyrus-imapd-2_2-tail
+/NEWS/1.5/Tue Feb 19 18:09:46 2002//Tcyrus-imapd-2_2-tail
+/README/1.5/Wed Nov 24 16:48:15 2004//Tcyrus-imapd-2_2-tail
+/addr-lex.l/1.8/Tue Feb 19 18:09:46 2002//Tcyrus-imapd-2_2-tail
+/addr.y/1.11/Wed Oct 22 18:50:30 2003//Tcyrus-imapd-2_2-tail
+/bc_dump.c/1.2/Wed Oct 22 18:03:23 2003//Tcyrus-imapd-2_2-tail
+/bc_emit.c/1.2/Wed Oct 22 18:03:24 2003//Tcyrus-imapd-2_2-tail
+/bc_eval.c/1.7/Thu Jul 29 15:42:31 2004//Tcyrus-imapd-2_2-tail
+/bc_generate.c/1.3/Wed Aug 11 18:43:15 2004//Tcyrus-imapd-2_2-tail
+/bytecode.h/1.3/Tue Jun 22 16:54:54 2004//Tcyrus-imapd-2_2-tail
+/comparator.c/1.17/Sun May  8 14:35:58 2005//Tcyrus-imapd-2_2-tail
+/comparator.h/1.11/Wed Oct 22 18:50:30 2003//Tcyrus-imapd-2_2-tail
+/hmac-md5.h/1.2/Sat May 25 19:57:52 2002//Tcyrus-imapd-2_2-tail
+/interp.c/1.23/Sun Nov  7 14:53:19 2004//Tcyrus-imapd-2_2-tail
+/interp.h/1.7/Sun Mar 10 02:58:09 2002//Tcyrus-imapd-2_2-tail
+/md5.c/1.4/Wed Jan  5 04:51:51 2000//Tcyrus-imapd-2_2-tail
+/md5.h/1.1.1.1/Fri Jul  2 18:55:35 1999//Tcyrus-imapd-2_2-tail
+/md5global.h/1.1.1.1/Fri Jul  2 18:55:35 1999//Tcyrus-imapd-2_2-tail
+/message.c/1.28/Thu Jul 15 15:02:51 2004//Tcyrus-imapd-2_2-tail
+/message.h/1.16/Wed Oct 22 18:50:30 2003//Tcyrus-imapd-2_2-tail
+/script.c/1.62/Thu Jul 15 15:02:51 2004//Tcyrus-imapd-2_2-tail
+/script.h/1.11/Wed Oct 22 18:50:30 2003//Tcyrus-imapd-2_2-tail
+/sieve-lex.l/1.20/Fri Jun  7 20:04:49 2002//Tcyrus-imapd-2_2-tail
+/sieve.y/1.32/Tue Jun 29 20:29:26 2004//Tcyrus-imapd-2_2-tail
+/sieve_err.et/1.2/Sat May 25 19:57:52 2002//Tcyrus-imapd-2_2-tail
+/sieve_interface.h/1.19/Wed Oct 22 18:50:30 2003//Tcyrus-imapd-2_2-tail
+/sievec.c/1.5/Thu Mar 11 15:23:20 2004//Tcyrus-imapd-2_2-tail
+/sieved.c/1.5/Tue Jun 29 20:05:32 2004//Tcyrus-imapd-2_2-tail
+/test.c/1.25/Tue Mar 15 16:08:48 2005//Tcyrus-imapd-2_2-tail
+/tree.c/1.11/Wed Oct 22 18:50:30 2003//Tcyrus-imapd-2_2-tail
+/tree.h/1.9/Mon Aug 30 11:33:17 2004//Tcyrus-imapd-2_2-tail
 D/tests////
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/AUTHORS/1.5/Thu Feb  9 19:29:40 2006//
-/COPYING/1.1.1.1/Thu Feb  9 19:29:40 2006//
-/ChangeLog/1.1.1.1/Thu Feb  9 19:29:40 2006//
-/Makefile.dist/1.7/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.38/Thu Feb  9 19:29:40 2006//
-/NEWS/1.5/Thu Feb  9 19:29:40 2006//
-/README/1.5/Thu Feb  9 19:29:40 2006//
-/addr-lex.l/1.8/Thu Feb  9 19:29:40 2006//
-/addr.y/1.11/Thu Feb  9 19:29:40 2006//
-/bc_dump.c/1.2/Thu Feb  9 19:29:40 2006//
-/bc_emit.c/1.2/Thu Feb  9 19:29:40 2006//
-/bc_eval.c/1.7/Thu Feb  9 19:29:40 2006//
-/bc_generate.c/1.3/Thu Feb  9 19:29:40 2006//
-/bytecode.h/1.3/Thu Feb  9 19:29:40 2006//
-/comparator.c/1.17/Thu Feb  9 19:29:40 2006//
-/comparator.h/1.11/Thu Feb  9 19:29:40 2006//
-/hmac-md5.h/1.2/Thu Feb  9 19:29:40 2006//
-/interp.c/1.23/Thu Feb  9 19:29:40 2006//
-/interp.h/1.7/Thu Feb  9 19:29:40 2006//
-/md5.c/1.4/Thu Feb  9 19:29:40 2006//
-/md5.h/1.1.1.1/Thu Feb  9 19:29:40 2006//
-/md5global.h/1.1.1.1/Thu Feb  9 19:29:40 2006//
-/message.c/1.28/Thu Feb  9 19:29:40 2006//
-/message.h/1.16/Thu Feb  9 19:29:40 2006//
-/script.c/1.62/Thu Feb  9 19:29:40 2006//
-/script.h/1.11/Thu Feb  9 19:29:40 2006//
-/sieve-lex.l/1.20/Thu Feb  9 19:29:40 2006//
-/sieve.y/1.32/Thu Feb  9 19:29:40 2006//
-/sieve_err.et/1.2/Thu Feb  9 19:29:40 2006//
-/sieve_interface.h/1.19/Thu Feb  9 19:29:40 2006//
-/sievec.c/1.5/Thu Feb  9 19:29:40 2006//
-/sieved.c/1.5/Thu Feb  9 19:29:40 2006//
-/test.c/1.25/Thu Feb  9 19:29:40 2006//
-/tree.c/1.11/Thu Feb  9 19:29:40 2006//
-/tree.h/1.9/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/sieve/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,5 +1,5 @@
+/README/1.2/Wed Oct 22 18:03:26 2003//Tcyrus-imapd-2_2-tail
 D/action////
 D/actionExtensions////
 D/test////
 D/testExtension////
-/README/1.2/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
+/uberActionScript.key/1.2/Wed Oct 22 18:03:27 2003//Tcyrus-imapd-2_2-tail
+/uberActionScript.s/1.2/Wed Oct 22 18:03:27 2003//Tcyrus-imapd-2_2-tail
 D/serverm////
 D/testm////
-/uberActionScript.key/1.2/Thu Feb  9 19:29:40 2006//
-/uberActionScript.s/1.2/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/action/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,6 +1,6 @@
-/uamail-discard/1.2/Thu Feb  9 19:29:40 2006//
-/uamail-keep/1.2/Thu Feb  9 19:29:40 2006//
-/uamail-redirect/1.2/Thu Feb  9 19:29:40 2006//
-/uamail-stop/1.2/Thu Feb  9 19:29:40 2006//
-/uamail-stop2/1.2/Thu Feb  9 19:29:40 2006//
+/uamail-discard/1.2/Wed Oct 22 18:03:28 2003//Tcyrus-imapd-2_2-tail
+/uamail-keep/1.2/Wed Oct 22 18:03:28 2003//Tcyrus-imapd-2_2-tail
+/uamail-redirect/1.2/Wed Oct 22 18:03:29 2003//Tcyrus-imapd-2_2-tail
+/uamail-stop/1.2/Wed Oct 22 18:03:29 2003//Tcyrus-imapd-2_2-tail
+/uamail-stop2/1.2/Wed Oct 22 18:03:29 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/action/serverm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,6 +1,6 @@
-/uatest-discard/1.2/Thu Feb  9 19:29:40 2006//
-/uatest-keep/1.2/Thu Feb  9 19:29:40 2006//
-/uatest-redirect/1.2/Thu Feb  9 19:29:40 2006//
-/uatest-stop/1.2/Thu Feb  9 19:29:40 2006//
-/uatest-stop2/1.2/Thu Feb  9 19:29:40 2006//
+/uatest-discard/1.2/Wed Oct 22 18:03:30 2003//Tcyrus-imapd-2_2-tail
+/uatest-keep/1.2/Wed Oct 22 18:03:30 2003//Tcyrus-imapd-2_2-tail
+/uatest-redirect/1.2/Wed Oct 22 18:03:30 2003//Tcyrus-imapd-2_2-tail
+/uatest-stop/1.2/Wed Oct 22 18:03:30 2003//Tcyrus-imapd-2_2-tail
+/uatest-stop2/1.2/Wed Oct 22 18:03:30 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/action/testm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
+/uberExtensionActionScript.key/1.2/Wed Oct 22 18:03:31 2003//Tcyrus-imapd-2_2-tail
+/uberExtensionActionScript.s/1.2/Wed Oct 22 18:03:31 2003//Tcyrus-imapd-2_2-tail
 D/serverm////
 D/testm////
-/uberExtensionActionScript.key/1.2/Thu Feb  9 19:29:40 2006//
-/uberExtensionActionScript.s/1.2/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,15 +1,15 @@
-/ueamail-denotify/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-denotify2/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-fileinto/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-flag1/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-flag2/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-flag3/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-flag4/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-flag5/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-mark/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-notify/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-notify2/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-reject/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-unmark/1.2/Thu Feb  9 19:29:40 2006//
-/ueamail-vacation/1.2/Thu Feb  9 19:29:40 2006//
+/ueamail-denotify/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-denotify2/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-fileinto/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-flag1/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-flag2/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-flag3/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-flag4/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-flag5/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-mark/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-notify/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-notify2/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-reject/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-unmark/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
+/ueamail-vacation/1.2/Wed Oct 22 18:03:32 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/serverm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,15 +1,15 @@
-/ueatest-denotify/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-denotify2/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-fileinto/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-flag1/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-flag2/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-flag3/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-flag4/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-flag5/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-mark/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-notify/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-notify2/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-reject/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-unmark/1.2/Thu Feb  9 19:29:40 2006//
-/ueatest-vacation/1.2/Thu Feb  9 19:29:40 2006//
+/ueatest-denotify/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-denotify2/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-fileinto/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-flag1/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-flag2/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-flag3/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-flag4/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-flag5/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-mark/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-notify/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-notify2/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-reject/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-unmark/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
+/ueatest-vacation/1.2/Wed Oct 22 18:03:33 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/actionExtensions/testm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
+/uberTestScript.key/1.2/Wed Oct 22 18:03:38 2003//Tcyrus-imapd-2_2-tail
+/uberTestScript.s/1.2/Wed Oct 22 18:03:38 2003//Tcyrus-imapd-2_2-tail
 D/serverm////
 D/testm////
-/uberTestScript.key/1.2/Thu Feb  9 19:29:40 2006//
-/uberTestScript.s/1.2/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/test/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,3 +1,3 @@
-/utmail-address/1.2/Thu Feb  9 19:29:40 2006//
-/utmail-header/1.2/Thu Feb  9 19:29:40 2006//
+/utmail-address/1.2/Wed Oct 22 18:03:39 2003//Tcyrus-imapd-2_2-tail
+/utmail-header/1.2/Wed Oct 22 18:03:39 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/test/serverm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,3 +1,3 @@
-/utest-address/1.2/Thu Feb  9 19:29:40 2006//
-/utest-header/1.2/Thu Feb  9 19:29:40 2006//
+/utest-address/1.2/Wed Oct 22 18:03:40 2003//Tcyrus-imapd-2_2-tail
+/utest-header/1.2/Wed Oct 22 18:03:40 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/test/testm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,4 +1,4 @@
+/uberExtensionTestScript.key/1.2/Wed Oct 22 18:03:41 2003//Tcyrus-imapd-2_2-tail
+/uberExtensionTestScript.s/1.2/Wed Oct 22 18:03:41 2003//Tcyrus-imapd-2_2-tail
 D/serverm////
 D/testm////
-/uberExtensionTestScript.key/1.2/Thu Feb  9 19:29:40 2006//
-/uberExtensionTestScript.s/1.2/Thu Feb  9 19:29:40 2006//

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,9 +1,9 @@
-/uetmail-areg/1.2/Thu Feb  9 19:29:40 2006//
-/uetmail-asub/1.2/Thu Feb  9 19:29:40 2006//
-/uetmail-count/1.2/Thu Feb  9 19:29:40 2006//
-/uetmail-count2/1.2/Thu Feb  9 19:29:40 2006//
-/uetmail-envelope/1.2/Thu Feb  9 19:29:40 2006//
-/uetmail-hreg/1.2/Thu Feb  9 19:29:40 2006//
-/uetmail-value/1.2/Thu Feb  9 19:29:40 2006//
-/uetmail-value2/1.2/Thu Feb  9 19:29:40 2006//
+/uetmail-areg/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
+/uetmail-asub/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
+/uetmail-count/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
+/uetmail-count2/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
+/uetmail-envelope/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
+/uetmail-hreg/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
+/uetmail-value/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
+/uetmail-value2/1.2/Wed Oct 22 18:03:42 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/serverm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,7 +1,7 @@
-/uetest-areg/1.2/Thu Feb  9 19:29:40 2006//
-/uetest-asub/1.2/Thu Feb  9 19:29:40 2006//
-/uetest-count/1.2/Thu Feb  9 19:29:40 2006//
-/uetest-envelope/1.2/Thu Feb  9 19:29:40 2006//
-/uetest-hreg/1.2/Thu Feb  9 19:29:40 2006//
-/uetest-value/1.2/Thu Feb  9 19:29:40 2006//
+/uetest-areg/1.2/Wed Oct 22 18:03:43 2003//Tcyrus-imapd-2_2-tail
+/uetest-asub/1.2/Wed Oct 22 18:03:43 2003//Tcyrus-imapd-2_2-tail
+/uetest-count/1.2/Wed Oct 22 18:03:43 2003//Tcyrus-imapd-2_2-tail
+/uetest-envelope/1.2/Wed Oct 22 18:03:43 2003//Tcyrus-imapd-2_2-tail
+/uetest-hreg/1.2/Wed Oct 22 18:03:43 2003//Tcyrus-imapd-2_2-tail
+/uetest-value/1.2/Wed Oct 22 18:03:43 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/sieve/tests/testExtension/testm/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/snmp/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/snmp/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/snmp/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/snmp/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,3 +1,3 @@
-/.cvsignore/1.1/Thu Feb  9 19:29:40 2006//
-/snmpgen/1.18/Thu Feb  9 19:29:40 2006//
+/.cvsignore/1.1/Sun Jan  6 02:03:33 2002//Tcyrus-imapd-2_2-tail
+/snmpgen/1.18/Mon Apr 11 06:08:58 2005//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/snmp/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/snmp/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/snmp/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/snmp/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/syslog/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/syslog/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/syslog/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/syslog/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,11 +1,11 @@
-/Makefile.in/1.10/Thu Feb  9 19:29:40 2006//
-/README/1.1/Thu Feb  9 19:29:40 2006//
-/logger.1/1.2/Thu Feb  9 19:29:40 2006//
-/logger.c/1.3/Thu Feb  9 19:29:40 2006//
-/syslog.3/1.2/Thu Feb  9 19:29:40 2006//
-/syslog.c/1.4/Thu Feb  9 19:29:40 2006//
-/syslog.conf/1.2/Thu Feb  9 19:29:40 2006//
-/syslog.h/1.3/Thu Feb  9 19:29:40 2006//
-/syslogd.8/1.2/Thu Feb  9 19:29:40 2006//
-/syslogd.c/1.3/Thu Feb  9 19:29:40 2006//
+/Makefile.in/1.10/Tue May 23 20:56:48 2000//Tcyrus-imapd-2_2-tail
+/README/1.1/Tue Mar 15 23:27:25 1994//Tcyrus-imapd-2_2-tail
+/logger.1/1.2/Tue May 23 20:56:48 2000//Tcyrus-imapd-2_2-tail
+/logger.c/1.3/Thu Feb 13 20:15:57 2003//Tcyrus-imapd-2_2-tail
+/syslog.3/1.2/Tue May 23 20:56:48 2000//Tcyrus-imapd-2_2-tail
+/syslog.c/1.4/Wed Jun  4 03:27:56 2003//Tcyrus-imapd-2_2-tail
+/syslog.conf/1.2/Wed Oct 19 15:57:13 1994//Tcyrus-imapd-2_2-tail
+/syslog.h/1.3/Thu Feb 13 20:15:57 2003//Tcyrus-imapd-2_2-tail
+/syslogd.8/1.2/Tue May 23 20:56:49 2000//Tcyrus-imapd-2_2-tail
+/syslogd.c/1.3/Thu Feb 13 20:15:57 2003//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/syslog/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/syslog/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/syslog/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/syslog/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/timsieved/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/timsieved/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/timsieved/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/timsieved/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,17 +1,17 @@
-/.cvsignore/1.2/Thu Feb  9 19:29:40 2006//
-/Makefile.in/1.25/Thu Aug 31 11:01:30 2006//T1.25
-/TODO/1.5/Thu Feb  9 19:29:40 2006//
-/actions.c/1.39/Thu Aug 31 11:01:30 2006//T1.39
-/actions.h/1.11/Thu Feb  9 19:29:40 2006//
-/codes.h/1.6/Thu Feb  9 19:29:40 2006//
-/exitcodes.h/1.4/Thu Feb  9 19:29:40 2006//
-/lex.c/1.24/Thu Feb  9 19:29:40 2006//
-/lex.h/1.11/Thu Feb  9 19:29:40 2006//
-/mystring.c/1.7/Thu Feb  9 19:29:40 2006//
-/mystring.h/1.6/Thu Feb  9 19:29:40 2006//
-/parser.c/1.40/Thu Aug 31 11:01:30 2006//T1.40
-/parser.h/1.4/Thu Feb  9 19:29:40 2006//
-/scripttest.c/1.23/Thu Feb  9 19:29:40 2006//
-/scripttest.h/1.9/Thu Feb  9 19:29:40 2006//
-/timsieved.c/1.57/Thu Aug 31 11:01:30 2006//T1.57
+/.cvsignore/1.2/Wed Oct 22 18:03:46 2003//Tcyrus-imapd-2_2-tail
+/Makefile.in/1.25/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/TODO/1.5/Fri Aug  1 13:22:25 2003//Tcyrus-imapd-2_2-tail
+/actions.c/1.39/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/actions.h/1.11/Tue Jun 24 15:34:00 2003//Tcyrus-imapd-2_2-tail
+/codes.h/1.6/Thu Feb 13 20:15:58 2003//Tcyrus-imapd-2_2-tail
+/exitcodes.h/1.4/Thu Feb 13 20:15:59 2003//Tcyrus-imapd-2_2-tail
+/lex.c/1.24/Wed Oct 22 18:50:31 2003//Tcyrus-imapd-2_2-tail
+/lex.h/1.11/Thu Feb 13 20:15:59 2003//Tcyrus-imapd-2_2-tail
+/mystring.c/1.7/Fri Feb 27 18:32:19 2004//Tcyrus-imapd-2_2-tail
+/mystring.h/1.6/Thu Feb 13 20:15:59 2003//Tcyrus-imapd-2_2-tail
+/parser.c/1.40/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
+/parser.h/1.4/Thu Feb 13 20:15:59 2003//Tcyrus-imapd-2_2-tail
+/scripttest.c/1.23/Thu Mar 11 15:23:21 2004//Tcyrus-imapd-2_2-tail
+/scripttest.h/1.9/Wed Oct 22 18:50:31 2003//Tcyrus-imapd-2_2-tail
+/timsieved.c/1.57/Wed Aug 30 16:29:11 2006//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/timsieved/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/timsieved/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/timsieved/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/timsieved/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail

Modified: branches/cvsmerge/cyrus-cvs/tools/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/tools/CVS/Entries?rev=690&root=cyrus22&r1=689&r2=690&view=diff
==============================================================================
--- branches/cvsmerge/cyrus-cvs/tools/CVS/Entries (original)
+++ branches/cvsmerge/cyrus-cvs/tools/CVS/Entries Thu Nov 30 19:39:08 2006
@@ -1,15 +1,15 @@
-/arbitronsort.pl/1.2/Thu Feb  9 19:29:40 2006//
-/config2header/1.12/Thu Feb  9 19:29:40 2006//
-/config2man/1.3/Thu Feb  9 19:29:40 2006//
-/convert-sieve.pl/1.2/Thu Feb  9 19:29:40 2006//
-/dohash/1.11/Thu Feb  9 19:29:40 2006//
-/masssievec/1.5/Thu Feb  9 19:29:40 2006//
-/mkimap/1.17/Thu Feb  9 19:29:40 2006//
-/mknewsgroups/1.2/Thu Feb  9 19:29:40 2006//
-/mupdate-loadgen.pl/1.2/Thu Feb  9 19:29:40 2006//
-/not-mkdep/1.3/Thu Feb  9 19:29:40 2006//
-/rehash/1.8/Thu Feb  9 19:29:40 2006//
-/translatesieve/1.7/Thu Feb  9 19:29:40 2006//
-/undohash/1.8/Thu Feb  9 19:29:40 2006//
-/upgradesieve/1.7/Thu Feb  9 19:29:40 2006//
+/arbitronsort.pl/1.2/Mon Aug  4 17:13:24 2003//Tcyrus-imapd-2_2-tail
+/config2header/1.12/Tue Apr 19 18:54:32 2005//Tcyrus-imapd-2_2-tail
+/config2man/1.3/Tue Dec  9 18:33:52 2003//Tcyrus-imapd-2_2-tail
+/convert-sieve.pl/1.2/Wed Oct 22 18:03:47 2003//Tcyrus-imapd-2_2-tail
+/dohash/1.11/Thu Dec  1 22:01:12 2005//Tcyrus-imapd-2_2-tail
+/masssievec/1.5/Thu Dec  1 22:01:12 2005//Tcyrus-imapd-2_2-tail
+/mkimap/1.17/Thu Dec  1 19:12:34 2005//Tcyrus-imapd-2_2-tail
+/mknewsgroups/1.2/Wed Oct 22 18:03:47 2003//Tcyrus-imapd-2_2-tail
+/mupdate-loadgen.pl/1.2/Wed Oct 22 18:03:47 2003//Tcyrus-imapd-2_2-tail
+/not-mkdep/1.3/Tue May 23 20:56:53 2000//Tcyrus-imapd-2_2-tail
+/rehash/1.8/Thu Dec  1 22:01:12 2005//Tcyrus-imapd-2_2-tail
+/translatesieve/1.7/Thu Dec  1 22:01:12 2005//Tcyrus-imapd-2_2-tail
+/undohash/1.8/Thu Dec  1 22:01:13 2005//Tcyrus-imapd-2_2-tail
+/upgradesieve/1.7/Thu Dec  1 22:01:13 2005//Tcyrus-imapd-2_2-tail
 D

Added: branches/cvsmerge/cyrus-cvs/tools/CVS/Tag
URL: https://mail.incase.de/viewcvs/branches/cvsmerge/cyrus-cvs/tools/CVS/Tag?rev=690&root=cyrus22&view=auto
==============================================================================
--- branches/cvsmerge/cyrus-cvs/tools/CVS/Tag (added)
+++ branches/cvsmerge/cyrus-cvs/tools/CVS/Tag Thu Nov 30 19:39:08 2006
@@ -1,0 +1,1 @@
+Tcyrus-imapd-2_2-tail




More information about the Pkg-Cyrus-imapd-Debian-devel mailing list