summaryrefslogtreecommitdiff
path: root/src/xftfont.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:43:42 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:43:42 +0000
commit591dcad65f73450a07ac7477a3a827d95eb6f726 (patch)
treed39091468270df7225717439077c308485c23026 /src/xftfont.c
parentc7e70c7e31897e00caaeb177176a8c24b834bc78 (diff)
downloadxorg-lib-libXft-591dcad65f73450a07ac7477a3a827d95eb6f726.tar.gz
Merging XORG-CURRENT into trunkXORG-6_7_99_1XACE-SELINUX-MERGECOMPOSITEWRAP
Diffstat (limited to 'src/xftfont.c')
-rw-r--r--src/xftfont.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xftfont.c b/src/xftfont.c
index 7698d60..8c28d97 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -1,7 +1,7 @@
/*
- * $XFree86: xc/lib/Xft/xftfont.c,v 1.11 2002/10/11 17:53:02 keithp Exp $
+ * $XFree86: xc/lib/Xft/xftfont.c,v 1.9 2002/02/15 07:36:11 keithp Exp $
*
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that