diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:08 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:08 +0000 |
commit | f8419f84622bf0b65e1ed62c1828d041613a3e01 (patch) | |
tree | 4e693cdab3788134c090f8c372d954d6d4025a39 /font.h | |
parent | 89c4f5b099d21bab972166ea898d8f333d98dad5 (diff) |
Merging XORG-CURRENT into trunk
Diffstat (limited to 'font.h')
-rw-r--r-- | font.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/fonts/font.h,v 3.5 2001/01/17 17:53:26 dawes Exp $ */ +/* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */ /* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */ #ifndef FONT_H |