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

---
 appres.c   | 2 +-
 appres.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appres.c b/appres.c
index d5c96d2..22da42c 100644
--- a/appres.c
+++ b/appres.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Jim Fulton, MIT X Consortium
  */
 
-/* $XFree86: xc/programs/appres/appres.c,v 1.4 2001/12/14 20:00:38 dawes Exp $ */
+/* $XFree86: xc/programs/appres/appres.c,v 1.3 2001/01/17 23:44:49 dawes Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <stdio.h>
diff --git a/appres.man b/appres.man
index cbf373c..ac9d8da 100644
--- a/appres.man
+++ b/appres.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/appres/appres.man,v 1.9 2003/05/29 21:48:10 herrb Exp $
+.\" $XFree86: xc/programs/appres/appres.man,v 1.8 2001/12/14 20:00:38 dawes Exp $
 .\"
 .TH APPRES 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3