diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:36 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:36 +0000 |
commit | 99b5a17471487105d3a2f092b0b1b98cd827c33c (patch) | |
tree | 0b40db196a0c6117e63a081b6029486701382ae9 | |
parent | e94bb05d084af4b50100f1925c91e2e41ce1f0f4 (diff) |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-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-- | config.c | 2 | ||||
-rw-r--r-- | main.c | 6 | ||||
-rw-r--r-- | pmdb.c | 2 | ||||
-rw-r--r-- | pmint.h | 2 | ||||
-rw-r--r-- | proxymngr.man | 2 |
5 files changed, 7 insertions, 7 deletions
@@ -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/proxymngr/config.c,v 1.7 2001/12/14 20:01:01 dawes Exp $ */ +/* $XFree86: xc/programs/proxymngr/config.c,v 1.6 2001/01/17 23:45:02 dawes Exp $ */ #include <stdlib.h> @@ -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/proxymngr/main.c,v 1.9 2003/07/09 15:27:36 tsi Exp $ */ +/* $XFree86: xc/programs/proxymngr/main.c,v 1.8tsi Exp $ */ #include <stdlib.h> #include "pmint.h" @@ -62,8 +62,8 @@ IcePaVersionRec PMReplyVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION, IcePoVersionRec PMSetupVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION, PMSetupProcessMessages}}; -char *PM_VENDOR_STRING = "The X.Org Group"; -char *PM_VENDOR_RELEASE = "Release 6.6"; +char *PM_VENDOR_STRING = XVENDORNAME; +char *PM_VENDOR_RELEASE = XORG_RELEASE; int verbose = 0; @@ -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/proxymngr/pmdb.c,v 1.8 2003/09/13 21:33:11 dawes Exp $ */ +/* $XFree86: xc/programs/proxymngr/pmdb.c,v 1.7 2001/12/14 20:01:02 dawes Exp $ */ #include "pmint.h" #include "pmdb.h" @@ -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/proxymngr/pmint.h,v 1.6 2003/09/13 21:33:11 dawes Exp $ */ +/* $XFree86: xc/programs/proxymngr/pmint.h,v 1.5 2001/12/14 20:01:02 dawes Exp $ */ #include <stdio.h> #include <X11/Xos.h> diff --git a/proxymngr.man b/proxymngr.man index 5c09994..21a8092 100644 --- a/proxymngr.man +++ b/proxymngr.man @@ -24,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.9 2003/05/29 21:48:10 herrb Exp $ +.\" $XFree86: xc/programs/proxymngr/proxymngr.man,v 1.8 2003/02/20 03:27:32 dawes Exp $ .\" .TH PROXYMNGR 1 __xorgversion__ .SH NAME |