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 | |
parent | 89c4f5b099d21bab972166ea898d8f333d98dad5 (diff) | |
download | xorg-proto-fontsproto-f8419f84622bf0b65e1ed62c1828d041613a3e01.tar.gz |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEsco_port_updatelg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP
-rw-r--r-- | FS.h | 2 | ||||
-rw-r--r-- | FSproto.h | 2 | ||||
-rw-r--r-- | font.h | 2 | ||||
-rw-r--r-- | fontproto.h | 2 | ||||
-rw-r--r-- | fontstruct.h | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -50,7 +50,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/fonts/FS.h,v 1.10 2003/07/18 15:53:24 tsi Exp $ */ +/* $XFree86: xc/include/fonts/FS.h,v 1.9 2003/07/09 15:27:28 tsi Exp $ */ #ifndef _FS_H_ #define _FS_H_ @@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/include/fonts/FSproto.h,v 1.3 2001/12/14 19:53:31 dawes Exp $ */ +/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */ #ifndef _FS_PROTO_H_ #define _FS_PROTO_H_ @@ -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 diff --git a/fontproto.h b/fontproto.h index e30cae1..83c9a00 100644 --- a/fontproto.h +++ b/fontproto.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/fonts/fontproto.h,v 1.3 2001/04/05 17:42:26 dawes Exp $ */ +/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */ /*********************************************************** diff --git a/fontstruct.h b/fontstruct.h index 7eb3925..451ed6a 100644 --- a/fontstruct.h +++ b/fontstruct.h @@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/fonts/fontstruct.h,v 3.4 2001/01/17 17:53:26 dawes Exp $ */ +/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */ #ifndef FONTSTR_H #define FONTSTR_H |