From 11e04778ce8cc31fc03c8cc961b1c74f589c7c95 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:27 +0000
Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected
 files.     Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
     future conflicts on ASCII but not humal readable files. (There should    
 probably be separate CreditsXorg.rtf files) (Egbert Eich).

---
 xgamma.c   | 2 +-
 xgamma.man | 2 +-
 2 files changed, 2 insertions(+), 2 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..45c4a81 100644
--- a/xgamma.man
+++ b/xgamma.man
@@ -18,7 +18,7 @@
 .\" 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
-- 
cgit v1.2.3