diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:58 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:58 +0000 |
commit | 0e0e651357c2fd8787a3b7007120e0776f2063af (patch) | |
tree | d406de86c9ed99ea115b5efdeb2b5ac1c082d4eb | |
parent | b156707c5bb2a8f3b2082592a077046a75f4df70 (diff) |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-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-MERGEXORG-6_8-branch
-rw-r--r-- | xlsatoms.c | 2 | ||||
-rw-r--r-- | xlsatoms.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.6 2001/12/14 20:02:08 dawes Exp $ */ +/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.5 2001/04/01 14:00:23 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/xlsatoms.man b/xlsatoms.man index b6f9a69..3c3ebb6 100644 --- a/xlsatoms.man +++ b/xlsatoms.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.8 2001/12/14 20:02:08 dawes Exp $ +.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.7 2001/01/27 18:21:17 dawes Exp $ .\" .TH XLSATOMS 1 __xorgversion__ .SH NAME |