Mercurial > emacs
comparison src/ftxfont.c @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | aec1143e8d85 376148b31b5e |
children | ef719132ddfa |
comparison
equal
deleted
inserted
replaced
112227:07e52ed69b5d | 112228:417b1e4d63cd |
---|---|
1 /* ftxfont.c -- FreeType font driver on X (without using XFT). | 1 /* ftxfont.c -- FreeType font driver on X (without using XFT). |
2 Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 2 Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
3 Copyright (C) 2006, 2007, 2008, 2009, 2010 | 3 Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 |
4 National Institute of Advanced Industrial Science and Technology (AIST) | 4 National Institute of Advanced Industrial Science and Technology (AIST) |
5 Registration Number H13PRO009 | 5 Registration Number H13PRO009 |
6 | 6 |
7 This file is part of GNU Emacs. | 7 This file is part of GNU Emacs. |
8 | 8 |