From 3d4783e06169c3b96eea0a9826c06d8c6a12ae02 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:23 +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). --- lisp/test/hello.lsp | 2 +- lisp/test/list.lsp | 2 +- lisp/test/math.lsp | 2 +- lisp/test/regex.lsp | 2 +- lisp/test/stream.lsp | 2 +- lisp/test/widgets.lsp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lisp/test') diff --git a/lisp/test/hello.lsp b/lisp/test/hello.lsp index 5446919..a3cce0f 100644 --- a/lisp/test/hello.lsp +++ b/lisp/test/hello.lsp @@ -27,7 +27,7 @@ ;; Author: Paulo César Pereira de Andrade ;; ;; -;; $XFree86: xc/programs/xedit/lisp/test/hello.lsp,v 1.3 2002/11/08 08:01:01 paulo Exp $ +;; $XFree86: xc/programs/xedit/lisp/test/hello.lsp,v 1.1 2001/08/31 15:00:15 paulo Exp $ ;; (require "xaw") (require "xt") diff --git a/lisp/test/list.lsp b/lisp/test/list.lsp index 23f4496..a142a85 100644 --- a/lisp/test/list.lsp +++ b/lisp/test/list.lsp @@ -27,7 +27,7 @@ ;; Author: Paulo César Pereira de Andrade ;; ;; -;; $XFree86: xc/programs/xedit/lisp/test/list.lsp,v 1.6 2002/12/06 03:25:29 paulo Exp $ +;; $XFree86: xc/programs/xedit/lisp/test/list.lsp,v 1.5 2002/11/26 04:06:30 paulo Exp $ ;; ;; basic lisp function tests diff --git a/lisp/test/math.lsp b/lisp/test/math.lsp index 162f73f..84a4627 100644 --- a/lisp/test/math.lsp +++ b/lisp/test/math.lsp @@ -27,7 +27,7 @@ ;; Author: Paulo César Pereira de Andrade ;; ;; -;; $XFree86: xc/programs/xedit/lisp/test/math.lsp,v 1.5 2003/01/30 02:46:26 paulo Exp $ +;; $XFree86: xc/programs/xedit/lisp/test/math.lsp,v 1.4 2002/11/30 23:13:14 paulo Exp $ ;; ;; basic math tests diff --git a/lisp/test/regex.lsp b/lisp/test/regex.lsp index 64ba572..0610017 100644 --- a/lisp/test/regex.lsp +++ b/lisp/test/regex.lsp @@ -27,7 +27,7 @@ ;; Author: Paulo César Pereira de Andrade ;; ;; -;; $XFree86: xc/programs/xedit/lisp/test/regex.lsp,v 1.2 2002/12/11 04:44:28 paulo Exp $ +;; $XFree86: xc/programs/xedit/lisp/test/regex.lsp,v 1.1 2002/12/10 03:59:04 paulo Exp $ ;; ;; Basic regex tests. This file is only for xedit lisp and for it's regex diff --git a/lisp/test/stream.lsp b/lisp/test/stream.lsp index 8af4ff6..414ee40 100644 --- a/lisp/test/stream.lsp +++ b/lisp/test/stream.lsp @@ -27,7 +27,7 @@ ;; Author: Paulo César Pereira de Andrade ;; ;; -;; $XFree86: xc/programs/xedit/lisp/test/stream.lsp,v 1.4 2002/12/10 03:59:04 paulo Exp $ +;; $XFree86: xc/programs/xedit/lisp/test/stream.lsp,v 1.3 2002/12/06 03:25:29 paulo Exp $ ;; ;; most format tests from the cltl second edition samples diff --git a/lisp/test/widgets.lsp b/lisp/test/widgets.lsp index be68788..a528a2c 100644 --- a/lisp/test/widgets.lsp +++ b/lisp/test/widgets.lsp @@ -27,7 +27,7 @@ ;; Author: Paulo César Pereira de Andrade ;; ;; -;; $XFree86: xc/programs/xedit/lisp/test/widgets.lsp,v 1.3 2002/11/08 08:01:01 paulo Exp $ +;; $XFree86: xc/programs/xedit/lisp/test/widgets.lsp,v 1.1 2001/08/31 15:00:15 paulo Exp $ ;; (require "xaw") (require "xt") -- cgit v1.2.3