From aae92e5772fdfc20c44ff48625e968e67cb3f405 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:36 +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).

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

diff --git a/xkill.c b/xkill.c
index b23b99d..f0b3356 100644
--- a/xkill.c
+++ b/xkill.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xkill/xkill.c,v 1.6 2001/12/14 20:02:06 dawes Exp $ */
+/* $XFree86: xc/programs/xkill/xkill.c,v 1.5 2001/04/01 14:00:22 tsi Exp $ */
 
 /*
  * xkill - simple program for destroying unwanted clients
diff --git a/xkill.man b/xkill.man
index 07eb5f6..25c1313 100644
--- a/xkill.man
+++ b/xkill.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xkill/xkill.man,v 1.9 2003/09/18 19:01:33 herrb Exp $
+.\" $XFree86: xkill.man,v 1.8 2001/12/14 20:02:06 dawes Exp $
 .\"
 .TH XKILL 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3