diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:42 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:42 +0000 |
commit | fb768609ea31ca228c1d97a997bbcb62a496984b (patch) | |
tree | 50731fff7a4af82c16152ec82b5bc832621a52c5 /include/X11/fonts/bitmap.h | |
parent | 9fb403503248fea923533300380cfc4bbb45823a (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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 'include/X11/fonts/bitmap.h')
-rw-r--r-- | include/X11/fonts/bitmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h index 29989e3..b5df964 100644 --- a/include/X11/fonts/bitmap.h +++ b/include/X11/fonts/bitmap.h @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/bitmap.h,v 1.10 2001/12/14 19:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium |