diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:47 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:47 +0000 |
commit | e8f144a169de2ffefdfb53d4b4de69ca6124a9a0 (patch) | |
tree | a36cffda425b41fd95d025bc4bb9a82e6b085fec | |
parent | 8cb0ec61b6ed59e49ec14d2bafd6899043eee769 (diff) |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_99_99_900XORG-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-- | xfindproxy.c | 2 | ||||
-rw-r--r-- | xfindproxy.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xfindproxy.c b/xfindproxy.c index 7592167..aa2385f 100644 --- a/xfindproxy.c +++ b/xfindproxy.c @@ -25,7 +25,7 @@ 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/xfindproxy/xfindproxy.c,v 1.9 2003/05/27 22:27:05 tsi Exp $ */ +/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.8tsi Exp $ */ #include <stdio.h> diff --git a/xfindproxy.man b/xfindproxy.man index aa29256..122c6f8 100644 --- a/xfindproxy.man +++ b/xfindproxy.man @@ -24,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xfindproxy/xfindproxy.man,v 1.7 2001/12/14 20:01:32 dawes Exp $ +.\" $XFree86: xc/programs/xfindproxy/xfindproxy.man,v 1.6 2001/01/27 18:21:12 dawes Exp $ .\" .TH XFINDPROXY 1 __xorgversion__ .SH NAME |