diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:26 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:26 +0000 |
| commit | 14e2551db92a44684cb96ab30a483f057d71d571 (patch) | |
| tree | cf961cfedfd97da9c7bd273195f0b116c84c0bf5 | |
| parent | d0b037ee4cbfc063daeb0413c6f69062635f0bf9 (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).
| -rw-r--r-- | src/Xinerama.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Xinerama.c b/src/Xinerama.c index 7138613..43084b2 100644 --- a/src/Xinerama.c +++ b/src/Xinerama.c @@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.3 2002/10/16 00:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.2 2001/07/23 17:20:28 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES |