diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:19 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:32:19 +0000 |
commit | a6f893a91b305f2ba563b00f8d3345d929ae2fc1 (patch) | |
tree | e414da075818f865108f4decf2f2536d05aacac4 | |
parent | 9bd8649e634475ed63d2c6575c55782b1b6f18a9 (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
-rw-r--r-- | config.c | 2 | ||||
-rw-r--r-- | main.c | 2 | ||||
-rw-r--r-- | pmdb.c | 2 | ||||
-rw-r--r-- | pmint.h | 2 | ||||
-rw-r--r-- | proxymngr.man | 2 |
5 files changed, 5 insertions, 5 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" @@ -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 |