From 151d659e1738faaa342c0782814d834f97525b5f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:49:03 +0000
Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files
 that had     a changed license. There was only one change which happened to
 be from     me (Egbert Eich).

---
 lisp/re/README    | 2 +-
 lisp/re/re.c      | 2 +-
 lisp/re/re.h      | 2 +-
 lisp/re/rec.c     | 2 +-
 lisp/re/reo.c     | 2 +-
 lisp/re/rep.h     | 2 +-
 lisp/re/tests.c   | 2 +-
 lisp/re/tests.txt | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lisp/re')

diff --git a/lisp/re/README b/lisp/re/README
index 848e1e9..aafad89 100644
--- a/lisp/re/README
+++ b/lisp/re/README
@@ -1,4 +1,4 @@
-$XFree86: xc/programs/xedit/lisp/re/README,v 1.4 2002/11/15 07:01:32 paulo Exp $
+$XFree86: xc/programs/xedit/lisp/re/README,v 1.3 2002/09/23 01:25:41 paulo Exp $
 
 LAST UPDATED:	$Date$
 
diff --git a/lisp/re/re.c b/lisp/re/re.c
index d848a4b..fd902a5 100644
--- a/lisp/re/re.c
+++ b/lisp/re/re.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/re/re.c,v 1.9 2002/12/11 04:44:28 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/re/re.c,v 1.8 2002/11/17 07:51:30 paulo Exp $ */
 
 #include <stdio.h>
 #include "rep.h"
diff --git a/lisp/re/re.h b/lisp/re/re.h
index 332366e..146dca5 100644
--- a/lisp/re/re.h
+++ b/lisp/re/re.h
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/re/re.h,v 1.2 2002/09/23 01:25:41 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/re/re.h,v 1.1 2002/09/08 02:29:50 paulo Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lisp/re/rec.c b/lisp/re/rec.c
index 20f9fd9..db08199 100644
--- a/lisp/re/rec.c
+++ b/lisp/re/rec.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/re/rec.c,v 1.4 2003/01/16 06:25:52 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/re/rec.c,v 1.3 2002/11/15 07:01:33 paulo Exp $ */
 
 #include "rep.h"
 
diff --git a/lisp/re/reo.c b/lisp/re/reo.c
index 59cbf3b..b8667d0 100644
--- a/lisp/re/reo.c
+++ b/lisp/re/reo.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/re/reo.c,v 1.9 2002/11/15 07:01:33 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/re/reo.c,v 1.8 2002/09/29 02:55:01 paulo Exp $ */
 
 #include "rep.h"
 
diff --git a/lisp/re/rep.h b/lisp/re/rep.h
index 5e4d5d5..7f37f26 100644
--- a/lisp/re/rep.h
+++ b/lisp/re/rep.h
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/re/rep.h,v 1.3 2002/11/25 02:35:32 paulo Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/re/rep.h,v 1.2 2002/11/15 07:01:33 paulo Exp $ */
 
 #include "re.h"
 
diff --git a/lisp/re/tests.c b/lisp/re/tests.c
index bd5c55d..7fe5677 100644
--- a/lisp/re/tests.c
+++ b/lisp/re/tests.c
@@ -27,7 +27,7 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/re/tests.c,v 1.1 2002/09/08 02:29:50 paulo Exp $ */
+/* $XFree86$ */
 
 /*
  * Compile with:	cc -o tests tests.c -L. -lre
diff --git a/lisp/re/tests.txt b/lisp/re/tests.txt
index e3da032..85a9578 100644
--- a/lisp/re/tests.txt
+++ b/lisp/re/tests.txt
@@ -27,7 +27,7 @@
 #  Author: Paulo César Pereira de Andrade
 #
 #
-# $XFree86: xc/programs/xedit/lisp/re/tests.txt,v 1.3 2002/11/08 08:01:00 paulo Exp $
+# $XFree86: xc/programs/xedit/lisp/re/tests.txt,v 1.1 2002/09/08 02:29:50 paulo Exp $
 
 # Some tests for the library:
 #	lines starting with # are comments
-- 
cgit v1.2.3