summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:42:47 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:42:47 +0000
commitc64ab991f19d542a4d340fde190d0cd819e24114 (patch)
tree645a4200b325f9dfa45c9b7f65c9cfd42d76a704
parent50fd91205709092a640e3b35b3062ffb279941f1 (diff)
downloadxorg-lib-libXRes-XACE-SELINUX.tar.gz
Merge the new release from HEADXACE-SELINUX
-rw-r--r--include/X11/extensions/XRes.h2
-rw-r--r--man/XRes.man6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h
index 5b3374e..99a3643 100644
--- a/include/X11/extensions/XRes.h
+++ b/include/X11/extensions/XRes.h
@@ -1,7 +1,7 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
+/* $XdotOrg: xc/include/extensions/XRes.h,v 1.2 2004/04/23 18:43:06 eich Exp $ */
/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */
#ifndef _XRES_H
diff --git a/man/XRes.man b/man/XRes.man
index 179e308..25c27b9 100644
--- a/man/XRes.man
+++ b/man/XRes.man
@@ -1,5 +1,5 @@
.\"
-.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $
+.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.2 2004/04/23 18:43:36 eich Exp $
.\" $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.
@@ -131,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