18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

28 files changed, 29 insertions, 29 deletions

diff --git a/src/add_window.c b/src/add_window.c
index 9b6a6c7..b9dd3ba 100644
--- a/src/add_window.c
+++ b/src/add_window.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/add_window.c,v 1.13 2003/08/04 10:32:30 eich Exp $ */
+/* $XFree86: xc/programs/twm/add_window.c,v 1.11 2002/04/04 14:05:58 eich Exp $ */
 /*****************************************************************************/
 /*
 
diff --git a/src/add_window.h b/src/add_window.h
index 298a133..190c9ff 100644
--- a/src/add_window.h
+++ b/src/add_window.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/add_window.h,v 1.6 2001/12/14 20:01:06 dawes Exp $ */
+/* $XFree86: xc/programs/twm/add_window.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 
 /**********************************************************************
diff --git a/src/cursor.c b/src/cursor.c
index 89583ab..be0c2e6 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/cursor.c,v 1.5 2001/12/14 20:01:06 dawes Exp $ */
+/* $XFree86: xc/programs/twm/cursor.c,v 1.4 2001/01/17 23:45:05 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/events.c b/src/events.c
index 77d8bad..e9e7efc 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/events.c,v 1.13 2003/04/21 11:46:13 herrb Exp $ */
+/* $XFree86: xc/programs/twm/events.c,v 1.12 2001/12/14 20:01:06 dawes Exp $ */
 /*****************************************************************************/
 /*
 
diff --git a/src/events.h b/src/events.h
index 1187c0d..6bc941e 100644
--- a/src/events.h
+++ b/src/events.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/events.h,v 1.6 2001/12/14 20:01:07 dawes Exp $ */
+/* $XFree86: xc/programs/twm/events.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 
 /***********************************************************************
diff --git a/src/gc.c b/src/gc.c
index 4b10a52..6bc7b87 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/gc.c,v 1.6 2001/12/14 20:01:07 dawes Exp $ */
+/* $XFree86: xc/programs/twm/gc.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 
 /**********************************************************************
diff --git a/src/gc.h b/src/gc.h
index 852b618..c0b9566 100644
--- a/src/gc.h
+++ b/src/gc.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/gc.h,v 1.5 2001/12/14 20:01:07 dawes Exp $ */
+/* $XFree86: xc/programs/twm/gc.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */
 
 
 /**********************************************************************
diff --git a/src/gram.y b/src/gram.y
index e8a0759..372b3b5 100644
--- a/src/gram.y
+++ b/src/gram.y
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
  * 11-Nov-90 Dave Sternlicht            Adding SaveColors
  * 10-Oct-90 David M. Sternlicht        Storing saved colors on root
  *
- * $XFree86: xc/programs/twm/gram.y,v 3.9 2002/10/21 13:33:05 alanh Exp $
+ * $XFree86: xc/programs/twm/gram.y,v 3.8 2002/10/16 21:33:03 tsi Exp $
  *
  ***********************************************************************/
 
diff --git a/src/iconmgr.c b/src/iconmgr.c
index f7af30d..edb5489 100644
--- a/src/iconmgr.c
+++ b/src/iconmgr.c
@@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/iconmgr.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */
+/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 /***********************************************************************
  *
@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
  * 09-Mar-89 Tom LaStrange		File Created
  *
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/iconmgr.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */
+/* $XFree86: xc/programs/twm/iconmgr.c,v 1.5 2001/01/17 23:45:06 dawes Exp $ */
 
 #include <stdio.h>
 #include "twm.h"
diff --git a/src/iconmgr.h b/src/iconmgr.h
index 1a956f0..eba3dc5 100644
--- a/src/iconmgr.h
+++ b/src/iconmgr.h
@@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/iconmgr.h,v 1.6 2001/12/14 20:01:08 dawes Exp $ */
+/* $XFree86: xc/programs/twm/iconmgr.h,v 1.5 2001/08/27 21:11:39 dawes Exp $ */
 
 /***********************************************************************
  *
diff --git a/src/icons.c b/src/icons.c
index 937096b..95c786f 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/icons.c,v 1.7 2002/12/10 22:29:54 tsi Exp $ */
+/* $XFree86: xc/programs/twm/icons.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */
 
 /**********************************************************************
  *
diff --git a/src/icons.h b/src/icons.h
index 678fe3a..a59e42c 100644
--- a/src/icons.h
+++ b/src/icons.h
@@ -22,7 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * */
-/* $XFree86: xc/programs/twm/icons.h,v 1.5 2001/12/14 20:01:08 dawes Exp $ */
+/* $XFree86: xc/programs/twm/icons.h,v 1.4 2001/01/17 23:45:06 dawes Exp $ */
 
 /**********************************************************************
  *
diff --git a/src/lex.l b/src/lex.l
index 93f3bd7..6f0f627 100644
--- a/src/lex.l
+++ b/src/lex.l
@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
  * 12-Nov-87 Thomas E. LaStrange		File created
  *
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/lex.l,v 3.14 2001/12/14 20:01:08 dawes Exp $ */
+/* $XFree86: xc/programs/twm/lex.l,v 3.13 2001/08/27 21:11:39 dawes Exp $ */
 
 /* #include <stdio.h> */		/* lex already includes stdio.h */
 #include "twm.h"
diff --git a/src/list.c b/src/list.c
index b392a1b..36c8fe2 100644
--- a/src/list.c
+++ b/src/list.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/list.c,v 1.9 2003/04/21 11:46:13 herrb Exp $ */
+/* $XFree86: xc/programs/twm/list.c,v 1.8 2002/09/24 21:00:27 tsi Exp $ */
 
 
 /**********************************************************************
diff --git a/src/list.h b/src/list.h
index 123397c..35488f5 100644
--- a/src/list.h
+++ b/src/list.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/list.h,v 1.5 2001/12/14 20:01:08 dawes Exp $ */
+/* $XFree86: xc/programs/twm/list.h,v 1.4 2001/01/17 23:45:07 dawes Exp $ */
 
 
 /**********************************************************************
diff --git a/src/menus.c b/src/menus.c
index 0686226..0073976 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/menus.c,v 1.20 2003/08/04 10:32:30 eich Exp $ */
+/* $XFree86: xc/programs/twm/menus.c,v 1.18tsi Exp $ */
 /*****************************************************************************/
 /*
 
diff --git a/src/menus.h b/src/menus.h
index 55e1a4c..6e8c31f 100644
--- a/src/menus.h
+++ b/src/menus.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/menus.h,v 1.6 2001/12/14 20:01:09 dawes Exp $ */
+/* $XFree86: xc/programs/twm/menus.h,v 1.5 2001/08/27 21:11:40 dawes Exp $ */
 
 
 /***********************************************************************
diff --git a/src/parse.c b/src/parse.c
index 500c38f..6e6915e 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/parse.c,v 1.17 2003/08/04 10:32:30 eich Exp $ */
+/* $XFree86: xc/programs/twm/parse.c,v 1.15 2002/09/24 21:00:28 tsi Exp $ */
 /*****************************************************************************/
 /*
 
diff --git a/src/parse.h b/src/parse.h
index f1e096b..cb63a62 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/twm/parse.h,v 1.11 2001/12/14 20:01:09 dawes Exp $ */
+/* $XFree86: xc/programs/twm/parse.h,v 1.10 2001/09/30 17:58:19 herrb Exp $ */
 /*****************************************************************************/
 /*
 
diff --git a/src/resize.c b/src/resize.c
index 113cb45..905dea5 100644
--- a/src/resize.c
+++ b/src/resize.c
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
  *
  ***********************************************************************/
 
-/* $XFree86: xc/programs/twm/resize.c,v 1.8 2001/12/14 20:01:09 dawes Exp $ */
+/* $XFree86: xc/programs/twm/resize.c,v 1.7 2001/01/17 23:45:07 dawes Exp $ */
 
 #include <stdio.h>
 #include "twm.h"
diff --git a/src/resize.h b/src/resize.h
index 395f2ec..4cee8f2 100644
--- a/src/resize.h
+++ b/src/resize.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/resize.h,v 1.5 2001/12/14 20:01:10 dawes Exp $ */
+/* $XFree86: xc/programs/twm/resize.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */
 
 
 /**********************************************************************
diff --git a/src/screen.h b/src/screen.h
index 8215bf1..2299262 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
  * 11-3-88 Dave Payne, Apple Computer			File created
  *
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/screen.h,v 1.6 2003/08/04 10:32:30 eich Exp $ */
+/* $XFree86: xc/programs/twm/screen.h,v 1.4 2001/01/17 23:45:08 dawes Exp $ */
 
 #ifndef _SCREEN_
 #define _SCREEN_
diff --git a/src/session.c b/src/session.c
index df35afc..638ac8e 100644
--- a/src/session.c
+++ b/src/session.c
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group.
 
 Author:  Ralph Mor, X Consortium
 ******************************************************************************/
-/* $XFree86: xc/programs/twm/session.c,v 3.9 2003/04/21 11:46:13 herrb Exp $ */
+/* $XFree86: xc/programs/twm/session.c,v 3.8 2001/12/14 20:01:10 dawes Exp $ */
 
 #include <X11/Xos.h>
 
diff --git a/src/system.twmrc b/src/system.twmrc
index 4c6da60..740a1e9 100644
--- a/src/system.twmrc
+++ b/src/system.twmrc
@@ -9,7 +9,7 @@
 # users were accustomed to uwm, the defaults could be set up not to decorate
 # any windows and to use meta-keys.
 #
-# $XFree86: xc/programs/twm/system.twmrc,v 1.5 2003/08/04 10:32:30 eich Exp $
+# $XFree86: xc/programs/twm/system.twmrc,v 1.4 2001/01/17 23:45:08 dawes Exp $
 #
 
 NoGrabServer
diff --git a/src/twm.c b/src/twm.c
index 88c5c0a..575ee45 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
  * 27-Oct-87 Thomas E. LaStrange	File created
  * 10-Oct-90 David M. Sternlicht        Storing saved colors on root
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/twm.c,v 3.15 2003/08/04 10:32:30 eich Exp $ */
+/* $XFree86: xc/programs/twm/twm.c,v 3.13 2003/04/21 08:15:10 herrb Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/src/twm.h b/src/twm.h
index 47364e8..a697d82 100644
--- a/src/twm.h
+++ b/src/twm.h
@@ -60,7 +60,7 @@ from The Open Group.
  * 28-Oct-87 Thomas E. LaStrange	File created
  * 10-Oct-90 David M. Sternlicht        Storeing saved colors on root
  ***********************************************************************/
-/* $XFree86: xc/programs/twm/twm.h,v 3.13 2003/04/21 11:46:14 herrb Exp $ */
+/* $XFree86: xc/programs/twm/twm.h,v 3.12 2001/12/14 20:01:10 dawes Exp $ */
 
 #ifndef _TWM_
 #define _TWM_
diff --git a/src/util.c b/src/util.c
index 5056dcc..6bdd901 100644
--- a/src/util.c
+++ b/src/util.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/util.c,v 1.13 2002/09/24 21:00:28 tsi Exp $ */
+/* $XFree86: xc/programs/twm/util.c,v 1.12 2002/09/19 13:22:05 tsi Exp $ */
 
 
 /***********************************************************************
diff --git a/src/util.h b/src/util.h
index 0554f4a..4cbd091 100644
--- a/src/util.h
+++ b/src/util.h
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /**    TORTIOUS ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE    **/
 /**    OR PERFORMANCE OF THIS SOFTWARE.                                     **/
 /*****************************************************************************/
-/* $XFree86: xc/programs/twm/util.h,v 1.7 2001/12/14 20:01:11 dawes Exp $ */
+/* $XFree86: xc/programs/twm/util.h,v 1.6 2001/01/17 23:45:08 dawes Exp $ */
 
 
 /***********************************************************************