diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
| commit | 3d4783e06169c3b96eea0a9826c06d8c6a12ae02 (patch) | |
| tree | 1008a7775a52ce81a8b28a5ff5cf2bc58527d5ff /lisp/mp | |
| parent | 6503c7eb0c08963d1842ecbae540e40fc408f6f1 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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).
Diffstat (limited to 'lisp/mp')
| -rw-r--r-- | lisp/mp/mp.c | 2 | ||||
| -rw-r--r-- | lisp/mp/mp.h | 2 | ||||
| -rw-r--r-- | lisp/mp/mpi.c | 2 | ||||
| -rw-r--r-- | lisp/mp/mpr.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lisp/mp/mp.c b/lisp/mp/mp.c index 78b7a0e..6aa7ce1 100644 --- a/lisp/mp/mp.c +++ b/lisp/mp/mp.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/mp/mp.c,v 1.3 2002/11/20 07:44:43 paulo Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/mp/mp.c,v 1.2 2002/11/08 08:01:00 paulo Exp $ */ #include "mp.h" diff --git a/lisp/mp/mp.h b/lisp/mp/mp.h index 88f1b24..d3f145d 100644 --- a/lisp/mp/mp.h +++ b/lisp/mp/mp.h @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/mp/mp.h,v 1.6 2003/01/12 03:55:51 tsi Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/mp/mp.h,v 1.5tsi Exp $ */ #include <stdio.h> #include <math.h> diff --git a/lisp/mp/mpi.c b/lisp/mp/mpi.c index ec8f587..443e8ab 100644 --- a/lisp/mp/mpi.c +++ b/lisp/mp/mpi.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/mp/mpi.c,v 1.13 2003/03/25 04:18:28 dawes Exp $ */ +/* $XFree86: xc/programs/xedit/lisp/mp/mpi.c,v 1.12 2002/11/20 07:44:43 paulo Exp $ */ #include "mp.h" diff --git a/lisp/mp/mpr.c b/lisp/mp/mpr.c index 8b26fe0..2ce5718 100644 --- a/lisp/mp/mpr.c +++ b/lisp/mp/mpr.c @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/programs/xedit/lisp/mp/mpr.c,v 1.2 2002/11/08 08:01:00 paulo Exp $ */ +/* $XFree86$ */ #include "mp.h" |