From f76ab59c4316564f3342e461c5c3fa22dd4b3241 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:48 +0000
Subject: Merging XORG-CURRENT into trunk

---
 xgamma.c   | 2 +-
 xgamma.man | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xgamma.c b/xgamma.c
index 177de62..ac210a0 100644
--- a/xgamma.c
+++ b/xgamma.c
@@ -21,7 +21,7 @@
  * 
  * Written by David Bateman
  */
-/* $XFree86: xc/programs/xgamma/xgamma.c,v 1.4 1999/04/25 10:02:57 dawes Exp $ */
+/* $XFree86: xc/programs/xgamma/xgamma.c,v 1.3 1999/03/21 07:35:38 dawes Exp $ */
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/xgamma.man b/xgamma.man
index 8b27894..546f688 100644
--- a/xgamma.man
+++ b/xgamma.man
@@ -18,11 +18,11 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The XFree86 Project.
 .\"
-.\" $XFree86: xc/programs/xgamma/xgamma.man,v 1.7 2001/01/27 18:21:14 dawes Exp $
+.\" $XFree86: xc/programs/xgamma/xgamma.man,v 1.6 2001/01/24 00:06:45 dawes Exp $
 .\"
 .TH xgamma 1 __vendorversion__
 .SH NAME
-xgamma - Alter a monitor's gamma correction for XFree86
+xgamma - Alter a monitor's gamma correction through the X server
 .SH SYNOPSIS
 .B "xgamma"
 [-display \fIdisplay\fP] [-screen \fIscreen\fP] [-quiet]
@@ -31,7 +31,7 @@ xgamma - Alter a monitor's gamma correction for XFree86
 .PP
 .B xgamma
 allows X users to query and alter the gamma correction of a monitor via
-the XFree86 X server video mode extension (XFree86-VidModeExtension).
+the X video mode extension (XFree86-VidModeExtension).
 .SH OPTIONS
 .PP
 .TP 8
-- 
cgit v1.2.3