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/FreeType/ft.h | |
| parent | 9fb403503248fea923533300380cfc4bbb45823a (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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).
Diffstat (limited to 'src/FreeType/ft.h')
| -rw-r--r-- | src/FreeType/ft.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FreeType/ft.h b/src/FreeType/ft.h index b597457..91c8d42 100644 --- a/src/FreeType/ft.h +++ b/src/FreeType/ft.h @@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.23 2003/10/19 18:53:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.22 2003/06/08 15:41:13 herrb Exp $ */ #ifndef _FT_H_ #define _FT_H_ |