diff options
| author | Egbert Eich <eich@freedesktop.org> | 2004-03-05 13:38:15 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2004-03-05 13:38:15 +0000 |
| commit | b82e8b257b7f76c3cba137401077d6d448678113 (patch) | |
| tree | 3f7b48adf66eb0dbe9229a9394e2ce110db27391 /modules/im/ximcp/imDispch.c | |
| parent | 261ec6cd2b1f4cafdd1e9f2307964d925f51f1a5 (diff) | |
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).DAMAGE-XFIXES-BASE
Diffstat (limited to 'modules/im/ximcp/imDispch.c')
| -rw-r--r-- | modules/im/ximcp/imDispch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/im/ximcp/imDispch.c b/modules/im/ximcp/imDispch.c index 8b42948..a9b3175 100644 --- a/modules/im/ximcp/imDispch.c +++ b/modules/im/ximcp/imDispch.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDispch.c,v 1.5 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDispch.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */ #include <X11/Xlib.h> #include "Xlibint.h" |