diff --git a/mozilla/cmd/winfe/taskbar.cpp b/mozilla/cmd/winfe/taskbar.cpp
index dcb999cca61..7f81adb5d8e 100755
--- a/mozilla/cmd/winfe/taskbar.cpp
+++ b/mozilla/cmd/winfe/taskbar.cpp
@@ -17,7 +17,7 @@
  */
 ///
 //
-// $Revision: 1.1 $
+// $Revision: 3.1 $
 //
 // TASKBAR.CPP
 //
diff --git a/mozilla/cmd/winfe/taskbar.h b/mozilla/cmd/winfe/taskbar.h
index ac4e580d8d8..e1dcb391da9 100755
--- a/mozilla/cmd/winfe/taskbar.h
+++ b/mozilla/cmd/winfe/taskbar.h
@@ -17,7 +17,7 @@
  */
 ///
 //
-// $Revision: 1.1 $
+// $Revision: 3.1 $
 //
 // TASKBAR.H
 //
diff --git a/mozilla/cmd/xfe/colorpicker.c b/mozilla/cmd/xfe/colorpicker.c
index 410b0348aad..5598b728145 100644
--- a/mozilla/cmd/xfe/colorpicker.c
+++ b/mozilla/cmd/xfe/colorpicker.c
@@ -21,7 +21,7 @@
  *
  *  Created: David Williams <djw@netscape.com>, Apr-20-1997
  *
- *  RCSID: "$Id: colorpicker.c,v 1.1 1998-03-28 02:21:53 ltabb Exp $"
+ *  RCSID: "$Id: colorpicker.c,v 3.1 1998-03-28 03:19:56 ltabb Exp $"
  */
 
 #include "mozilla.h"
diff --git a/mozilla/cmd/xfe/cplusplusmain.cc b/mozilla/cmd/xfe/cplusplusmain.cc
index bc836fbd4f3..d7ca17f5f40 100644
--- a/mozilla/cmd/xfe/cplusplusmain.cc
+++ b/mozilla/cmd/xfe/cplusplusmain.cc
@@ -27,7 +27,7 @@
  *
  *  Created: David Williams <djw@netscape.com>, May-26-1996
  *
- *  RCSID: "$Id: cplusplusmain.cc,v 1.1 1998-03-28 02:21:56 ltabb Exp $"
+ *  RCSID: "$Id: cplusplusmain.cc,v 3.1 1998-03-28 03:19:58 ltabb Exp $"
  */
 
 
diff --git a/mozilla/cmd/xfe/editordialogs.c b/mozilla/cmd/xfe/editordialogs.c
index b0edabc3d3d..4dae3282fe0 100644
--- a/mozilla/cmd/xfe/editordialogs.c
+++ b/mozilla/cmd/xfe/editordialogs.c
@@ -22,7 +22,7 @@
  *  Should only be built for the editor.
  *  Created: David Williams <djw@netscape.com>, Mar-12-1996
  *
- *  RCSID: "$Id: editordialogs.c,v 1.1 1998-03-28 02:22:02 ltabb Exp $"
+ *  RCSID: "$Id: editordialogs.c,v 3.1 1998-03-28 03:20:03 ltabb Exp $"
  */
 
 #include "mozilla.h"
diff --git a/mozilla/cmd/xfe/plugins/ImAlive/npapi.h b/mozilla/cmd/xfe/plugins/ImAlive/npapi.h
index b7898b45924..d9b40550ba2 100644
--- a/mozilla/cmd/xfe/plugins/ImAlive/npapi.h
+++ b/mozilla/cmd/xfe/plugins/ImAlive/npapi.h
@@ -17,7 +17,7 @@
  */
 
 /*
- *  npapi.h $Revision: 1.1 $
+ *  npapi.h $Revision: 3.1 $
  *  Netscape client plug-in API spec
  */
 
diff --git a/mozilla/cmd/xfe/plugins/ImAlive/npupp.h b/mozilla/cmd/xfe/plugins/ImAlive/npupp.h
index d273c703557..be8f1e5e54e 100644
--- a/mozilla/cmd/xfe/plugins/ImAlive/npupp.h
+++ b/mozilla/cmd/xfe/plugins/ImAlive/npupp.h
@@ -17,7 +17,7 @@
  */
 /* */
 /*
- *  npupp.h $Revision: 1.1 $
+ *  npupp.h $Revision: 3.1 $
  *  function call mecahnics needed by platform specific glue code.
  */
 
diff --git a/mozilla/cmd/xfe/src/EditorToolbar.cpp b/mozilla/cmd/xfe/src/EditorToolbar.cpp
index 41a687aaadd..69e1fc66c45 100644
--- a/mozilla/cmd/xfe/src/EditorToolbar.cpp
+++ b/mozilla/cmd/xfe/src/EditorToolbar.cpp
@@ -22,7 +22,7 @@
  *  EditorToolbar.cpp --- Toolbar for Editor and HTML Mail Compose.
  *
  *  Created: David Williams <djw@netscape.com>, Feb-7-1997
- *  RCSID: "$Id: EditorToolbar.cpp,v 1.1 1998-03-28 02:29:35 ltabb Exp $"
+ *  RCSID: "$Id: EditorToolbar.cpp,v 3.1 1998-03-28 03:26:24 ltabb Exp $"
  *
  *----------------------------------------------------------------------------
  */
diff --git a/mozilla/cmd/xfe/src/EditorToolbar.h b/mozilla/cmd/xfe/src/EditorToolbar.h
index 080919008f6..73f5b8df232 100644
--- a/mozilla/cmd/xfe/src/EditorToolbar.h
+++ b/mozilla/cmd/xfe/src/EditorToolbar.h
@@ -22,7 +22,7 @@
  *  EditorToolbar.h --- Toolbar for Editor and HTML Mail Compose.
  *
  *  Created: David Williams <djw@netscape.com>, Feb-7-1997
- *  RCSID: "$Id: EditorToolbar.h,v 1.1 1998-03-28 02:29:36 ltabb Exp $"
+ *  RCSID: "$Id: EditorToolbar.h,v 3.1 1998-03-28 03:26:25 ltabb Exp $"
  *
  *----------------------------------------------------------------------------
  */
diff --git a/mozilla/cmd/xfe/xeditor.h b/mozilla/cmd/xfe/xeditor.h
index 7af4c25c397..db94d64b499 100644
--- a/mozilla/cmd/xfe/xeditor.h
+++ b/mozilla/cmd/xfe/xeditor.h
@@ -21,7 +21,7 @@
  *  Should only be include by files that work with the editor.
  *  Created: David Williams <djw@netscape.com>, Mar-12-1996
  *
- *  RCSID: "$Id: xeditor.h,v 1.1 1998-03-28 02:22:27 ltabb Exp $"
+ *  RCSID: "$Id: xeditor.h,v 3.1 1998-03-28 03:20:28 ltabb Exp $"
  */
 
 
diff --git a/mozilla/include/np.h b/mozilla/include/np.h
index 111ab5840bc..90c34f99475 100644
--- a/mozilla/include/np.h
+++ b/mozilla/include/np.h
@@ -18,7 +18,7 @@
 
 
 /*
- *  np.h $Revision: 1.1 $
+ *  np.h $Revision: 3.1 $
  *  Prototypes for functions exported by libplugin and called by the FEs or other XP libs.
  *  Prototypes for functions exported by the FEs and called by libplugin are in nppg.h.
  */
diff --git a/mozilla/include/npapi.h b/mozilla/include/npapi.h
index c78fb9ea34e..289346cb167 100644
--- a/mozilla/include/npapi.h
+++ b/mozilla/include/npapi.h
@@ -18,7 +18,7 @@
 
 
 /*
- *  npapi.h $Revision: 1.1 $
+ *  npapi.h $Revision: 3.1 $
  *  Netscape client plug-in API spec
  */
 
diff --git a/mozilla/include/npassoc.h b/mozilla/include/npassoc.h
index ba486431288..1f4ca6c0fc2 100644
--- a/mozilla/include/npassoc.h
+++ b/mozilla/include/npassoc.h
@@ -18,7 +18,7 @@
 
 
 /*
- *  npassoc.h $Revision: 1.1 $
+ *  npassoc.h $Revision: 3.1 $
  *  xp filetype associations
  */
 
diff --git a/mozilla/lib/htmldlgs/htmldlgs.c b/mozilla/lib/htmldlgs/htmldlgs.c
index 99ae8880aec..a7a42ae958a 100644
--- a/mozilla/lib/htmldlgs/htmldlgs.c
+++ b/mozilla/lib/htmldlgs/htmldlgs.c
@@ -19,7 +19,7 @@
  * Cross platform html dialogs
  *
  *
- * $Id: htmldlgs.c,v 1.1 1998-03-28 02:33:42 ltabb Exp $
+ * $Id: htmldlgs.c,v 3.1 1998-03-28 03:29:14 ltabb Exp $
  */
 
 #include "xp.h"
diff --git a/mozilla/lib/libcnv/adler32.c b/mozilla/lib/libcnv/adler32.c
index d77742d98ec..a62d5fa1815 100644
--- a/mozilla/lib/libcnv/adler32.c
+++ b/mozilla/lib/libcnv/adler32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: adler32.c,v 1.1 1998-03-28 02:34:13 ltabb Exp $ */
+/* $Id: adler32.c,v 3.1 1998-03-28 03:29:35 ltabb Exp $ */
 
 #include "zlib.h"
 
diff --git a/mozilla/lib/libcnv/deflate.c b/mozilla/lib/libcnv/deflate.c
index 2fb5ac0a55c..e0423d9a588 100644
--- a/mozilla/lib/libcnv/deflate.c
+++ b/mozilla/lib/libcnv/deflate.c
@@ -47,7 +47,7 @@
  *
  */
 
-/* $Id: deflate.c,v 1.1 1998-03-28 02:34:14 ltabb Exp $ */
+/* $Id: deflate.c,v 3.1 1998-03-28 03:29:36 ltabb Exp $ */
 
 #include "deflate.h"
 
diff --git a/mozilla/lib/libcnv/deflate.h b/mozilla/lib/libcnv/deflate.h
index 8e6a15964d0..5e7c9b40333 100644
--- a/mozilla/lib/libcnv/deflate.h
+++ b/mozilla/lib/libcnv/deflate.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: deflate.h,v 1.1 1998-03-28 02:34:15 ltabb Exp $ */
+/* $Id: deflate.h,v 3.1 1998-03-28 03:29:36 ltabb Exp $ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H
diff --git a/mozilla/lib/libcnv/trees.c b/mozilla/lib/libcnv/trees.c
index 6c5340d7851..0266a7fe311 100644
--- a/mozilla/lib/libcnv/trees.c
+++ b/mozilla/lib/libcnv/trees.c
@@ -29,7 +29,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* $Id: trees.c,v 1.1 1998-03-28 02:34:21 ltabb Exp $ */
+/* $Id: trees.c,v 3.1 1998-03-28 03:29:40 ltabb Exp $ */
 
 #include "deflate.h"
 
diff --git a/mozilla/lib/libcnv/zconf.h b/mozilla/lib/libcnv/zconf.h
index da911ea352e..816f3c84717 100644
--- a/mozilla/lib/libcnv/zconf.h
+++ b/mozilla/lib/libcnv/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: zconf.h,v 1.1 1998-03-28 02:34:24 ltabb Exp $ */
+/* $Id: zconf.h,v 3.1 1998-03-28 03:29:42 ltabb Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
diff --git a/mozilla/lib/libcnv/zutil.c b/mozilla/lib/libcnv/zutil.c
index b7e5ac856d6..be075265b74 100644
--- a/mozilla/lib/libcnv/zutil.c
+++ b/mozilla/lib/libcnv/zutil.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: zutil.c,v 1.1 1998-03-28 02:34:24 ltabb Exp $ */
+/* $Id: zutil.c,v 3.1 1998-03-28 03:29:42 ltabb Exp $ */
 
 #include <stdio.h>
 
diff --git a/mozilla/lib/libcnv/zutil.h b/mozilla/lib/libcnv/zutil.h
index 639d063ba0d..c110ad6559a 100644
--- a/mozilla/lib/libcnv/zutil.h
+++ b/mozilla/lib/libcnv/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: zutil.h,v 1.1 1998-03-28 02:34:25 ltabb Exp $ */
+/* $Id: zutil.h,v 3.1 1998-03-28 03:29:42 ltabb Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
diff --git a/mozilla/lib/libnet/crawler.c b/mozilla/lib/libnet/crawler.c
index fcd92f94967..c0ffd499b83 100644
--- a/mozilla/lib/libnet/crawler.c
+++ b/mozilla/lib/libnet/crawler.c
@@ -51,8 +51,8 @@
 
 	(definitely) i18n of the parser
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:36:29 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:25 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libnet/crawler.h b/mozilla/lib/libnet/crawler.h
index 90088e2f6f0..7ac5a06bd4a 100644
--- a/mozilla/lib/libnet/crawler.h
+++ b/mozilla/lib/libnet/crawler.h
@@ -45,8 +45,8 @@
 	The parsing code is in htmparse.c
 	The robots.txt parser is in robotxt.c
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:36:30 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:25 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libnet/htmparse.c b/mozilla/lib/libnet/htmparse.c
index 4be9fda46e7..6c469612c61 100644
--- a/mozilla/lib/libnet/htmparse.c
+++ b/mozilla/lib/libnet/htmparse.c
@@ -21,8 +21,8 @@
 
  /********************************************************************
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:36:36 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:31 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libnet/htmparse.h b/mozilla/lib/libnet/htmparse.h
index 593736f5e2a..14eb4f112a0 100644
--- a/mozilla/lib/libnet/htmparse.h
+++ b/mozilla/lib/libnet/htmparse.h
@@ -26,8 +26,8 @@
    parser calls this function whenever a begin or end tag, or run of
    character data has been scanned, and does not build a tree.
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:36:37 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:31 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libnet/mkcertld.h b/mozilla/lib/libnet/mkcertld.h
index 164c283160d..3fc1db6b916 100644
--- a/mozilla/lib/libnet/mkcertld.h
+++ b/mozilla/lib/libnet/mkcertld.h
@@ -20,7 +20,7 @@
 /*
  * mkcertld.h - api to cert ldap protocol code
  *
- * $Id: mkcertld.h,v 1.1 1998-03-28 02:36:43 ltabb Exp $
+ * $Id: mkcertld.h,v 3.1 1998-03-28 03:31:36 ltabb Exp $
  */
 
 XP_BEGIN_PROTOS
diff --git a/mozilla/lib/libnet/pagescan.c b/mozilla/lib/libnet/pagescan.c
index df02750e2cb..f7ae50e9400 100644
--- a/mozilla/lib/libnet/pagescan.c
+++ b/mozilla/lib/libnet/pagescan.c
@@ -51,8 +51,8 @@
 	<STYLE SRC=?>
 
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:37:06 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:58 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libnet/pagescan.h b/mozilla/lib/libnet/pagescan.h
index cd47ef91fca..bce6e210726 100644
--- a/mozilla/lib/libnet/pagescan.h
+++ b/mozilla/lib/libnet/pagescan.h
@@ -22,8 +22,8 @@
 
  /********************************************************************
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:37:06 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:58 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libnet/robotxt.c b/mozilla/lib/libnet/robotxt.c
index 15b6ef3e13c..25cdfddcde1 100644
--- a/mozilla/lib/libnet/robotxt.c
+++ b/mozilla/lib/libnet/robotxt.c
@@ -21,8 +21,8 @@
 
  /********************************************************************
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:37:07 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:59 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libnet/robotxt.h b/mozilla/lib/libnet/robotxt.h
index 763dfe5625e..bd475eba806 100644
--- a/mozilla/lib/libnet/robotxt.h
+++ b/mozilla/lib/libnet/robotxt.h
@@ -29,8 +29,8 @@
 	Note: the original spec says that at least one Disallow field must be present
 	in a record. That is what I am following.
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:37:07 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:31:59 $
 
  *********************************************************************/
 
diff --git a/mozilla/lib/libpics/htchunk.c b/mozilla/lib/libpics/htchunk.c
index 3fa2f3844ee..95a04a6b823 100644
--- a/mozilla/lib/libpics/htchunk.c
+++ b/mozilla/lib/libpics/htchunk.c
@@ -33,7 +33,7 @@ with copyright holders.
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: htchunk.c,v 1.1 1998-03-28 02:37:16 ltabb Exp $
+**	@(#) $Id: htchunk.c,v 3.1 1998-03-28 03:32:06 ltabb Exp $
 **
 ** history:	AL, HF	28 Apr 94, Now chunk->data is filled by '\0' so
 **			that the string is terminated at any time. That makes
diff --git a/mozilla/lib/libpics/htchunk.h b/mozilla/lib/libpics/htchunk.h
index ca8da029c89..67881aaeaa6 100644
--- a/mozilla/lib/libpics/htchunk.h
+++ b/mozilla/lib/libpics/htchunk.h
@@ -187,6 +187,6 @@ RETURN CURRENT SIZE
    
    ___________________________________
    
-                           @(#) $Id: htchunk.h,v 1.1 1998-03-28 02:37:16 ltabb Exp $
+                           @(#) $Id: htchunk.h,v 3.1 1998-03-28 03:32:06 ltabb Exp $
                                                                                           
     */
diff --git a/mozilla/lib/libpics/htlist.c b/mozilla/lib/libpics/htlist.c
index 8578c12e676..9201b49fac8 100644
--- a/mozilla/lib/libpics/htlist.c
+++ b/mozilla/lib/libpics/htlist.c
@@ -33,7 +33,7 @@ with copyright holders.
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: htlist.c,v 1.1 1998-03-28 02:37:16 ltabb Exp $
+**	@(#) $Id: htlist.c,v 3.1 1998-03-28 03:32:07 ltabb Exp $
 **
 **	A list is represented as a sequence of linked nodes of type HTList.
 **	The first node is a header which contains no object.
diff --git a/mozilla/lib/libpics/htlist.h b/mozilla/lib/libpics/htlist.h
index f8b1ef90a2c..4ad3d1ede9a 100644
--- a/mozilla/lib/libpics/htlist.h
+++ b/mozilla/lib/libpics/htlist.h
@@ -153,6 +153,6 @@ FREE LIST
    
    ___________________________________
    
-                            @(#) $Id: htlist.h,v 1.1 1998-03-28 02:37:17 ltabb Exp $
+                            @(#) $Id: htlist.h,v 3.1 1998-03-28 03:32:07 ltabb Exp $
                                                                                           
     */
diff --git a/mozilla/lib/libpics/htmemory.h b/mozilla/lib/libpics/htmemory.h
index ba5aa6eaaf7..655b03d525c 100644
--- a/mozilla/lib/libpics/htmemory.h
+++ b/mozilla/lib/libpics/htmemory.h
@@ -175,6 +175,6 @@ extern void HTMemory_outofmem(char * name, char * file, unsigned long line);
    
    ___________________________________
    
-                           @(#) $Id: htmemory.h,v 1.1 1998-03-28 02:37:17 ltabb Exp $
+                           @(#) $Id: htmemory.h,v 3.1 1998-03-28 03:32:07 ltabb Exp $
                                                                                           
     */
diff --git a/mozilla/lib/libpics/htstring.c b/mozilla/lib/libpics/htstring.c
index b2c0a1a02d1..8d23e5829f6 100644
--- a/mozilla/lib/libpics/htstring.c
+++ b/mozilla/lib/libpics/htstring.c
@@ -33,7 +33,7 @@ with copyright holders.
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: htstring.c,v 1.1 1998-03-28 02:37:18 ltabb Exp $
+**	@(#) $Id: htstring.c,v 3.1 1998-03-28 03:32:07 ltabb Exp $
 **
 **	Original version came with listserv implementation.
 **	Version TBL Oct 91 replaces one which modified the strings.
diff --git a/mozilla/lib/libpics/htstring.h b/mozilla/lib/libpics/htstring.h
index 85f4485b955..6d5a3fffbc7 100644
--- a/mozilla/lib/libpics/htstring.h
+++ b/mozilla/lib/libpics/htstring.h
@@ -123,6 +123,6 @@ extern char * HTStrip (char * s);
    
    ___________________________________
    
-                          @(#) $Id: htstring.h,v 1.1 1998-03-28 02:37:18 ltabb Exp $
+                          @(#) $Id: htstring.h,v 3.1 1998-03-28 03:32:08 ltabb Exp $
                                                                                           
     */
diff --git a/mozilla/lib/libpics/htutils.h b/mozilla/lib/libpics/htutils.h
index 14676d20e38..e4db47e11f0 100644
--- a/mozilla/lib/libpics/htutils.h
+++ b/mozilla/lib/libpics/htutils.h
@@ -265,6 +265,6 @@ LIBRARY DYNAMIC MEMORY MAGEMENT
    
    ___________________________________
    
-                           @(#) $Id: htutils.h,v 1.1 1998-03-28 02:37:18 ltabb Exp $
+                           @(#) $Id: htutils.h,v 3.1 1998-03-28 03:32:08 ltabb Exp $
                                                                                           
     */
diff --git a/mozilla/lib/libstyle/csslex.c b/mozilla/lib/libstyle/csslex.c
index 739e785d3d8..bbf65c37d89 100644
--- a/mozilla/lib/libstyle/csslex.c
+++ b/mozilla/lib/libstyle/csslex.c
@@ -37,7 +37,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/befator/cvs/jail/cvsroot/mozilla/lib/libstyle/Attic/csslex.c,v 1.1 1998-03-28 02:37:21 ltabb Exp $
+ * $Header: /home/befator/cvs/jail/cvsroot/mozilla/lib/libstyle/Attic/csslex.c,v 3.1 1998-03-28 03:32:11 ltabb Exp $
  */
 
 #define FLEX_SCANNER
diff --git a/mozilla/lib/plugin/npassoc.c b/mozilla/lib/plugin/npassoc.c
index 2116011f53e..9f4588166cb 100644
--- a/mozilla/lib/plugin/npassoc.c
+++ b/mozilla/lib/plugin/npassoc.c
@@ -17,7 +17,7 @@
  */
 
 /*
- *  npassoc.c $Revision: 1.1 $
+ *  npassoc.c $Revision: 3.1 $
  *  some xp mime-type file extension associations
  */
 
diff --git a/mozilla/lib/plugin/nppg.h b/mozilla/lib/plugin/nppg.h
index 6553bda1e81..340a7aa4969 100644
--- a/mozilla/lib/plugin/nppg.h
+++ b/mozilla/lib/plugin/nppg.h
@@ -17,7 +17,7 @@
  */
 
 /*
- *  nppg.h $Revision: 1.1 $
+ *  nppg.h $Revision: 3.1 $
  *  Prototypes for functions exported by the FEs and called by libplugin.
  *  Some (perhaps all) of these prototypes could be moved to fe_proto.h.
  *  Protypes for functions exported by libplugin are in np.h.
diff --git a/mozilla/lib/plugin/npupp.h b/mozilla/lib/plugin/npupp.h
index 936465c67df..a564ea1916c 100644
--- a/mozilla/lib/plugin/npupp.h
+++ b/mozilla/lib/plugin/npupp.h
@@ -18,7 +18,7 @@
 
 
 /*
- *  npupp.h $Revision: 1.1 $
+ *  npupp.h $Revision: 3.1 $
  *  function call mecahnics needed by platform specific glue code.
  */
 
diff --git a/mozilla/lib/xp/xp_qsort.c b/mozilla/lib/xp/xp_qsort.c
index ba18589826b..c88c4fa1e15 100644
--- a/mozilla/lib/xp/xp_qsort.c
+++ b/mozilla/lib/xp/xp_qsort.c
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: xp_qsort.c,v 1.1 1998-03-28 02:38:49 ltabb Exp $";
+	"$Id: xp_qsort.c,v 3.1 1998-03-28 03:33:33 ltabb Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
diff --git a/mozilla/modules/edtplug/classes/netscape/plugin/composer/io/SlidingBuffer.java b/mozilla/modules/edtplug/classes/netscape/plugin/composer/io/SlidingBuffer.java
index 28a9a4955a2..ed82d987dd2 100644
--- a/mozilla/modules/edtplug/classes/netscape/plugin/composer/io/SlidingBuffer.java
+++ b/mozilla/modules/edtplug/classes/netscape/plugin/composer/io/SlidingBuffer.java
@@ -17,9 +17,12 @@
  */
 
 /*
- * $Header: /home/befator/cvs/jail/cvsroot/mozilla/modules/edtplug/classes/netscape/plugin/composer/io/SlidingBuffer.java,v 1.1 1998-03-28 02:39:09 ltabb Exp $
+ * $Header: /home/befator/cvs/jail/cvsroot/mozilla/modules/edtplug/classes/netscape/plugin/composer/io/SlidingBuffer.java,v 3.1 1998-03-28 03:33:50 ltabb Exp $
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  1998/03/28 02:39:09  ltabb
+ * Free the lizard
+ *
  * Revision 2.1  1998/03/11 23:56:37  anthonyd
  * Bump revision number to 2
  *
diff --git a/mozilla/modules/libimg/public/il_icons.h b/mozilla/modules/libimg/public/il_icons.h
index ca914f43b3c..32778d89cd2 100644
--- a/mozilla/modules/libimg/public/il_icons.h
+++ b/mozilla/modules/libimg/public/il_icons.h
@@ -18,7 +18,7 @@
 
 /* -*- Mode: C; tab-width: 4 -*-
  *  il_icons.h --- Image icon enumeration.
- *  $Id: il_icons.h,v 1.1 1998-03-28 02:40:27 ltabb Exp $
+ *  $Id: il_icons.h,v 3.1 1998-03-28 03:34:56 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/public/il_strm.h b/mozilla/modules/libimg/public/il_strm.h
index d063d65c372..ce711d74633 100644
--- a/mozilla/modules/libimg/public/il_strm.h
+++ b/mozilla/modules/libimg/public/il_strm.h
@@ -18,7 +18,7 @@
 
 /* -*- Mode: C; tab-width: 4 -*-
  *  il_strm.h --- Stream converters for the image library.
- *  $Id: il_strm.h,v 1.1 1998-03-28 02:40:28 ltabb Exp $
+ *  $Id: il_strm.h,v 3.1 1998-03-28 03:34:57 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/public/il_types.h b/mozilla/modules/libimg/public/il_types.h
index 5552114aabd..4da4759cdbc 100644
--- a/mozilla/modules/libimg/public/il_types.h
+++ b/mozilla/modules/libimg/public/il_types.h
@@ -18,7 +18,7 @@
 
 /* -*- Mode: C; tab-width: 4 -*-
  *  il_types.h --- Image library data types and structures.
- *  $Id: il_types.h,v 1.1 1998-03-28 02:40:28 ltabb Exp $
+ *  $Id: il_types.h,v 3.1 1998-03-28 03:34:57 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/public/il_util.h b/mozilla/modules/libimg/public/il_util.h
index 0d92ef67f89..31776187930 100644
--- a/mozilla/modules/libimg/public/il_util.h
+++ b/mozilla/modules/libimg/public/il_util.h
@@ -19,7 +19,7 @@
 /* -*- Mode: C; tab-width: 4 -*-
  *  il_util.h Colormap and colorspace utilities.
  *             
- *   $Id: il_util.h,v 1.1 1998-03-28 02:40:28 ltabb Exp $
+ *   $Id: il_util.h,v 3.1 1998-03-28 03:34:57 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/public/libimg.h b/mozilla/modules/libimg/public/libimg.h
index 5dc74646e29..91087d07564 100644
--- a/mozilla/modules/libimg/public/libimg.h
+++ b/mozilla/modules/libimg/public/libimg.h
@@ -18,7 +18,7 @@
 
 /* -*- Mode: C; tab-width: 4 -*-
  *  libimg.h --- API calls to the Image Library.
- *  $Id: libimg.h,v 1.1 1998-03-28 02:40:29 ltabb Exp $
+ *  $Id: libimg.h,v 3.1 1998-03-28 03:34:57 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/public/ni_pixmp.h b/mozilla/modules/libimg/public/ni_pixmp.h
index 77cf3bb2b82..34b7728a82a 100644
--- a/mozilla/modules/libimg/public/ni_pixmp.h
+++ b/mozilla/modules/libimg/public/ni_pixmp.h
@@ -17,7 +17,7 @@
  */
 /* 
  *  ni_pixmp.h --- Cross platform pixmap data structure.
- *  $Id: ni_pixmp.h,v 1.1 1998-03-28 02:40:29 ltabb Exp $
+ *  $Id: ni_pixmp.h,v 3.1 1998-03-28 03:34:58 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/src/color.c b/mozilla/modules/libimg/src/color.c
index 711d4f76e10..d52fe41e5e2 100644
--- a/mozilla/modules/libimg/src/color.c
+++ b/mozilla/modules/libimg/src/color.c
@@ -21,7 +21,7 @@
                Includes dithering for B&W displays, but not dithering
                for PseudoColor displays which can be found in dither.c.
                
-   $Id: color.c,v 1.1 1998-03-28 02:40:31 ltabb Exp $
+   $Id: color.c,v 3.1 1998-03-28 03:34:59 ltabb Exp $
 */
 
 
diff --git a/mozilla/modules/libimg/src/colormap.c b/mozilla/modules/libimg/src/colormap.c
index 7bdcf21b6cb..2f573ea1288 100644
--- a/mozilla/modules/libimg/src/colormap.c
+++ b/mozilla/modules/libimg/src/colormap.c
@@ -19,7 +19,7 @@
 /* -*- Mode: C; tab-width: 4 -*-
  *  colormap.c
  *             
- *   $Id: colormap.c,v 1.1 1998-03-28 02:40:31 ltabb Exp $
+ *   $Id: colormap.c,v 3.1 1998-03-28 03:35:00 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/src/if.h b/mozilla/modules/libimg/src/if.h
index 6f054e42526..eb6d75cb641 100644
--- a/mozilla/modules/libimg/src/if.h
+++ b/mozilla/modules/libimg/src/if.h
@@ -18,7 +18,7 @@
 
 /*   if.h --- Top-level image library internal routines
  *
- * $Id: if.h,v 1.1 1998-03-28 02:40:33 ltabb Exp $
+ * $Id: if.h,v 3.1 1998-03-28 03:35:01 ltabb Exp $
  */
 
 #ifndef _if_h
diff --git a/mozilla/modules/libimg/src/il.h b/mozilla/modules/libimg/src/il.h
index f7bc3e11c97..f4ccdff052e 100644
--- a/mozilla/modules/libimg/src/il.h
+++ b/mozilla/modules/libimg/src/il.h
@@ -19,7 +19,7 @@
 /* -*- Mode: C; tab-width: 4 -*-
  *   il.h --- Exported image library interface
  *
- *   $Id: il.h,v 1.1 1998-03-28 02:40:33 ltabb Exp $
+ *   $Id: il.h,v 3.1 1998-03-28 03:35:02 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/src/il_util.c b/mozilla/modules/libimg/src/il_util.c
index 8d838238d33..c1c7d379d4a 100644
--- a/mozilla/modules/libimg/src/il_util.c
+++ b/mozilla/modules/libimg/src/il_util.c
@@ -19,7 +19,7 @@
 /* -*- Mode: C; tab-width: 4 -*-
  *  il_util.c Colormap and colorspace utilities.
  *             
- *   $Id: il_util.c,v 1.1 1998-03-28 02:40:34 ltabb Exp $
+ *   $Id: il_util.c,v 3.1 1998-03-28 03:35:02 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/src/il_utilp.h b/mozilla/modules/libimg/src/il_utilp.h
index 13e434ece52..390d1824597 100644
--- a/mozilla/modules/libimg/src/il_utilp.h
+++ b/mozilla/modules/libimg/src/il_utilp.h
@@ -20,7 +20,7 @@
  *  il_utilp.h Colormap and colorspace utilities - types and definitions
  *             private to Image Library.            
  *
- *   $Id: il_utilp.h,v 1.1 1998-03-28 02:40:34 ltabb Exp $
+ *   $Id: il_utilp.h,v 3.1 1998-03-28 03:35:02 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/src/ilclient.c b/mozilla/modules/libimg/src/ilclient.c
index 34e29f8a79f..d1d3ab19285 100644
--- a/mozilla/modules/libimg/src/ilclient.c
+++ b/mozilla/modules/libimg/src/ilclient.c
@@ -20,7 +20,7 @@
  *   ilclient.c --- Management of imagelib client data structures,
  *                  including image cache.
  *
- *   $Id: ilclient.c,v 1.1 1998-03-28 02:40:35 ltabb Exp $
+ *   $Id: ilclient.c,v 3.1 1998-03-28 03:35:02 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/src/jpeg.c b/mozilla/modules/libimg/src/jpeg.c
index bc5df3f06cf..f46a72acd3b 100644
--- a/mozilla/modules/libimg/src/jpeg.c
+++ b/mozilla/modules/libimg/src/jpeg.c
@@ -18,7 +18,7 @@
 
 /*
  *	  jpeg.c --- Glue code to Independent JPEG Group decoder library
- *    $Id: jpeg.c,v 1.1 1998-03-28 02:40:36 ltabb Exp $
+ *    $Id: jpeg.c,v 3.1 1998-03-28 03:35:03 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/libimg/src/xbm.c b/mozilla/modules/libimg/src/xbm.c
index 617cd47bf97..c225aa9bdd7 100644
--- a/mozilla/modules/libimg/src/xbm.c
+++ b/mozilla/modules/libimg/src/xbm.c
@@ -18,7 +18,7 @@
 
 /* -*- Mode: C; tab-width: 4 -*-
  *   xbm.c --- Decoding of X bit-map format images
- * $Id: xbm.c,v 1.1 1998-03-28 02:40:37 ltabb Exp $
+ * $Id: xbm.c,v 3.1 1998-03-28 03:35:04 ltabb Exp $
  */
 
 
diff --git a/mozilla/modules/plugin/base/public/npapi.h b/mozilla/modules/plugin/base/public/npapi.h
index c78fb9ea34e..289346cb167 100644
--- a/mozilla/modules/plugin/base/public/npapi.h
+++ b/mozilla/modules/plugin/base/public/npapi.h
@@ -18,7 +18,7 @@
 
 
 /*
- *  npapi.h $Revision: 1.1 $
+ *  npapi.h $Revision: 3.1 $
  *  Netscape client plug-in API spec
  */
 
diff --git a/mozilla/modules/rdf/src/rdfjava.c b/mozilla/modules/rdf/src/rdfjava.c
index f1742b400fb..000a1dd2042 100644
--- a/mozilla/modules/rdf/src/rdfjava.c
+++ b/mozilla/modules/rdf/src/rdfjava.c
@@ -18,7 +18,7 @@
 
 /*
  *
- *  $RCSfile: rdfjava.c,v $ $Revision: 1.1 $
+ *  $RCSfile: rdfjava.c,v $ $Revision: 3.1 $
  *	Copyright © 1997 Netscape Communications Corporation, All Rights Reserved.
  */
 
diff --git a/mozilla/modules/schedulr/public/schedulr.h b/mozilla/modules/schedulr/public/schedulr.h
index 73b3e6f8b39..82aa627fb5b 100644
--- a/mozilla/modules/schedulr/public/schedulr.h
+++ b/mozilla/modules/schedulr/public/schedulr.h
@@ -28,8 +28,8 @@
   directory as schedulr.htm.  The information given there is a
   superset of the comments in this file.
 
-  $Revision: 1.1 $
-  $Date: 1998-03-28 02:41:28 $
+  $Revision: 3.1 $
+  $Date: 1998-03-28 03:36:00 $
 
  *********************************************************************/
 
diff --git a/mozilla/modules/zlib/src/adler32.c b/mozilla/modules/zlib/src/adler32.c
index aa6688d8e07..f66310bbbe6 100644
--- a/mozilla/modules/zlib/src/adler32.c
+++ b/mozilla/modules/zlib/src/adler32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 /* This file was modified since it was taken from the zlib distribution */
-/* $Id: adler32.c,v 1.1 1998-03-28 02:41:39 ltabb Exp $ */
+/* $Id: adler32.c,v 3.1 1998-03-28 03:36:10 ltabb Exp $ */
 
 #include "zlib.h"
 
diff --git a/mozilla/modules/zlib/src/compress.c b/mozilla/modules/zlib/src/compress.c
index e26851bc617..aa1fbb100e6 100644
--- a/mozilla/modules/zlib/src/compress.c
+++ b/mozilla/modules/zlib/src/compress.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 /* This file was modified since it was taken from the zlib distribution */
-/* $Id: compress.c,v 1.1 1998-03-28 02:41:39 ltabb Exp $ */
+/* $Id: compress.c,v 3.1 1998-03-28 03:36:10 ltabb Exp $ */
 
 #include "zlib.h"
 
diff --git a/mozilla/modules/zlib/src/crc32.c b/mozilla/modules/zlib/src/crc32.c
index 5de25657044..f46608f8e0c 100644
--- a/mozilla/modules/zlib/src/crc32.c
+++ b/mozilla/modules/zlib/src/crc32.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 /* This file was modified since it was taken from the zlib distribution */
-/* $Id: crc32.c,v 1.1 1998-03-28 02:41:39 ltabb Exp $ */
+/* $Id: crc32.c,v 3.1 1998-03-28 03:36:10 ltabb Exp $ */
 
 #include "zlib.h"
 
diff --git a/mozilla/modules/zlib/src/deflate.c b/mozilla/modules/zlib/src/deflate.c
index 85d1ce79676..86b5ba70b00 100644
--- a/mozilla/modules/zlib/src/deflate.c
+++ b/mozilla/modules/zlib/src/deflate.c
@@ -47,7 +47,7 @@
  *
  */
 
-/* $Id: deflate.c,v 1.1 1998-03-28 02:41:40 ltabb Exp $ */
+/* $Id: deflate.c,v 3.1 1998-03-28 03:36:10 ltabb Exp $ */
 
 #include "deflate.h"
 
diff --git a/mozilla/modules/zlib/src/deflate.h b/mozilla/modules/zlib/src/deflate.h
index f6c229907b5..719877ccfac 100644
--- a/mozilla/modules/zlib/src/deflate.h
+++ b/mozilla/modules/zlib/src/deflate.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: deflate.h,v 1.1 1998-03-28 02:41:40 ltabb Exp $ */
+/* $Id: deflate.h,v 3.1 1998-03-28 03:36:11 ltabb Exp $ */
 
 #ifndef _DEFLATE_H
 #define _DEFLATE_H
diff --git a/mozilla/modules/zlib/src/example.c b/mozilla/modules/zlib/src/example.c
index ddd468f7fd3..07f36d1d280 100644
--- a/mozilla/modules/zlib/src/example.c
+++ b/mozilla/modules/zlib/src/example.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: example.c,v 1.1 1998-03-28 02:41:40 ltabb Exp $ */
+/* $Id: example.c,v 3.1 1998-03-28 03:36:11 ltabb Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/mozilla/modules/zlib/src/gzio.c b/mozilla/modules/zlib/src/gzio.c
index a73cb081f7f..0acfe6d600d 100644
--- a/mozilla/modules/zlib/src/gzio.c
+++ b/mozilla/modules/zlib/src/gzio.c
@@ -4,7 +4,7 @@
  */
 /* This file was modified since it was taken from the zlib distribution */
 
-/* $Id: gzio.c,v 1.1 1998-03-28 02:41:40 ltabb Exp $ */
+/* $Id: gzio.c,v 3.1 1998-03-28 03:36:11 ltabb Exp $ */
 
 #include <stdio.h>
 
diff --git a/mozilla/modules/zlib/src/minigzip.c b/mozilla/modules/zlib/src/minigzip.c
index 862857e5822..1f895b15720 100644
--- a/mozilla/modules/zlib/src/minigzip.c
+++ b/mozilla/modules/zlib/src/minigzip.c
@@ -13,7 +13,7 @@
  * or in pipe mode.
  */
 
-/* $Id: minigzip.c,v 1.1 1998-03-28 02:41:44 ltabb Exp $ */
+/* $Id: minigzip.c,v 3.1 1998-03-28 03:36:15 ltabb Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/mozilla/modules/zlib/src/trees.c b/mozilla/modules/zlib/src/trees.c
index 100f1f5ca9b..6cc2aa74ce4 100644
--- a/mozilla/modules/zlib/src/trees.c
+++ b/mozilla/modules/zlib/src/trees.c
@@ -29,7 +29,7 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* $Id: trees.c,v 1.1 1998-03-28 02:41:44 ltabb Exp $ */
+/* $Id: trees.c,v 3.1 1998-03-28 03:36:16 ltabb Exp $ */
 
 #include "deflate.h"
 
diff --git a/mozilla/modules/zlib/src/uncompr.c b/mozilla/modules/zlib/src/uncompr.c
index bc0d908aa0d..408ebb1a96f 100644
--- a/mozilla/modules/zlib/src/uncompr.c
+++ b/mozilla/modules/zlib/src/uncompr.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 /* This file was modified since it was taken from the zlib distribution */
-/* $Id: uncompr.c,v 1.1 1998-03-28 02:41:45 ltabb Exp $ */
+/* $Id: uncompr.c,v 3.1 1998-03-28 03:36:16 ltabb Exp $ */
 
 #include "zlib.h"
 
diff --git a/mozilla/modules/zlib/src/zconf.h b/mozilla/modules/zlib/src/zconf.h
index 8b077887a09..64ac972ce0b 100644
--- a/mozilla/modules/zlib/src/zconf.h
+++ b/mozilla/modules/zlib/src/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 /* This file was modified since it was taken from the zlib distribution */
-/* $Id: zconf.h,v 1.1 1998-03-28 02:41:45 ltabb Exp $ */
+/* $Id: zconf.h,v 3.1 1998-03-28 03:36:16 ltabb Exp $ */
 
 #ifndef _ZCONF_H
 #define _ZCONF_H
diff --git a/mozilla/modules/zlib/src/zutil.c b/mozilla/modules/zlib/src/zutil.c
index 77f8c45acbf..bd8811e8139 100644
--- a/mozilla/modules/zlib/src/zutil.c
+++ b/mozilla/modules/zlib/src/zutil.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 /* This file was modified since it was taken from the zlib distribution */
-/* $Id: zutil.c,v 1.1 1998-03-28 02:41:46 ltabb Exp $ */
+/* $Id: zutil.c,v 3.1 1998-03-28 03:36:17 ltabb Exp $ */
 
 #include <stdio.h>
 
diff --git a/mozilla/modules/zlib/src/zutil.h b/mozilla/modules/zlib/src/zutil.h
index ab21faabc09..b7b12728358 100644
--- a/mozilla/modules/zlib/src/zutil.h
+++ b/mozilla/modules/zlib/src/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: zutil.h,v 1.1 1998-03-28 02:41:46 ltabb Exp $ */
+/* $Id: zutil.h,v 3.1 1998-03-28 03:36:18 ltabb Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H