diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:36 +0000 |
| commit | e47da1b068cd9b8a772a99e30b2c1d5271d4295e (patch) | |
| tree | 061a4166a206dfc3da23fc2afd8a80a29082f14c | |
| parent | 5597850916b8c24c6d430fcac50c88b2d97a6f01 (diff) | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-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_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-- | include/X11/extensions/XRes.h | 3 | ||||
| -rw-r--r-- | man/XRes.man | 7 | ||||
| -rw-r--r-- | src/XRes.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h index b9a1e9f..5b3374e 100644 --- a/include/X11/extensions/XRes.h +++ b/include/X11/extensions/XRes.h @@ -1,7 +1,8 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */ #ifndef _XRES_H #define _XRES_H diff --git a/man/XRes.man b/man/XRes.man index 1ce24b9..9a98e21 100644 --- a/man/XRes.man +++ b/man/XRes.man @@ -1,5 +1,6 @@ .\" -.\" $XFree86: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $ +.\" $XdotOrg$ +.\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $ .\" .\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. .\" @@ -130,9 +131,9 @@ will return .I BadValue if passed an illegal client identifier. .SH "SEE ALSO" -Xlib(1), X(7) +X(__miscmansuffix__) .SH AUTHOR -Mark Vojkovich, for The XFree86 Project Inc. +Mark Vojkovich, originally for The XFree86 Project Inc. .SH STABILITY This API is considered as experimental. The XRes library major revision may be incremented whenever incompatible changes are done to @@ -1,7 +1,7 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/lib/XRes/XRes.c,v 1.4 2002/10/16 00:37:26 dawes Exp $ */ +/* $XFree86: xc/lib/XRes/XRes.c,v 1.3 2002/03/10 22:06:53 mvojkovi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES |