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 /src/builtins/builtin.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 'src/builtins/builtin.h')
| -rw-r--r-- | src/builtins/builtin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h index caee81c..f29a82c 100644 --- a/src/builtins/builtin.h +++ b/src/builtins/builtin.h @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include <X11/Xdefs.h> #include <font.h> |