diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:55:09 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:55:09 +0000 |
commit | ac7cc196b722ee4653326aee459f40ad16a260c1 (patch) | |
tree | fa4c8ba92765112553a7ba90b7809c820a35e65e | |
parent | 43e099d499d4dbabb32ca0410175e0e1b814cd94 (diff) |
Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-baseXORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGE
-rw-r--r-- | dsimple.c | 2 | ||||
-rw-r--r-- | dsimple.h | 2 | ||||
-rw-r--r-- | xwininfo.c | 2 | ||||
-rw-r--r-- | xwininfo.man | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.7 2003/09/24 02:43:38 dawes Exp $ */ +/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.6 2001/12/14 20:02:09 dawes Exp $ */ #include <X11/Xos.h> #include <X11/Xlib.h> @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.9 2003/11/17 22:20:54 dawes Exp $ */ +/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */ /* * Just_display.h: This file contains the definitions needed to use the @@ -29,7 +29,7 @@ or other dealings in this Software without prior written authorization of the copyright holder. */ -/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.10 2003/09/20 16:08:32 herrb Exp $ */ +/* $XFree86: xc/programs/xwininfo/xwininfo.c,v 1.9 2003/09/09 22:08:25 herrb Exp $ */ /* diff --git a/xwininfo.man b/xwininfo.man index 6246fe3..8493df0 100644 --- a/xwininfo.man +++ b/xwininfo.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xwininfo/xwininfo.man,v 1.9 2004/01/12 21:43:20 herrb Exp $ +.\" $XFree86: xwininfo.man,v 1.8 2001/12/14 20:02:35 dawes Exp $ .\" .TH XWININFO 1 __xorgversion__ .SH NAME |