diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:06 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:06 +0000 |
| commit | f2d372317dada51162c0a8c77a84bd924185955a (patch) | |
| tree | b5a4d78af2b89be081b45cbe37ea618e4e32e483 /src/error.c | |
| parent | 886d7dc02b0d14074df048196829573a66d91819 (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-BASEXORG-CURRENTDAMAGE-XFIXES
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 'src/error.c')
| -rw-r--r-- | src/error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/error.c b/src/error.c index b9f527a..09fbbb2 100644 --- a/src/error.c +++ b/src/error.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/error.c,v 1.6 2001/12/14 19:53:35 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/error.c,v 1.5 2001/10/28 03:32:28 tsi Exp $ */ #include <X11/ICE/ICElib.h> #include "ICElibint.h" |