diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-19 09:07:37 +0200 |
| commit | 2d042f719910c5aa1ba9f4a47b21009c729c345e (patch) | |
| tree | 2b20d89d5f1ca342ca6f1d817c18b324adf7086f /fontconfig/src/fcobjs.h | |
| parent | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (diff) | |
| parent | 854ec4da20ddff9b830be0a7d5b81d8cb4774132 (diff) | |
| download | vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.gz vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.tar.bz2 vcxsrv-2d042f719910c5aa1ba9f4a47b21009c729c345e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013
Conflicts:
fontconfig/src/fccache.c
Diffstat (limited to 'fontconfig/src/fcobjs.h')
| -rw-r--r-- | fontconfig/src/fcobjs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fontconfig/src/fcobjs.h b/fontconfig/src/fcobjs.h index 682fe6ad3..87c7319e3 100644 --- a/fontconfig/src/fcobjs.h +++ b/fontconfig/src/fcobjs.h @@ -23,7 +23,7 @@ FC_OBJECT (FILE, FcTypeString, FcCompareFilename) FC_OBJECT (INDEX, FcTypeInteger, NULL) FC_OBJECT (RASTERIZER, FcTypeString, FcCompareString) FC_OBJECT (OUTLINE, FcTypeBool, FcCompareBool) -FC_OBJECT (SCALABLE, FcTypeBool, NULL) +FC_OBJECT (SCALABLE, FcTypeBool, FcCompareBool) FC_OBJECT (DPI, FcTypeDouble, NULL) FC_OBJECT (RGBA, FcTypeInteger, NULL) FC_OBJECT (SCALE, FcTypeDouble, NULL) @@ -35,7 +35,7 @@ FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) FC_OBJECT (LANG, FcTypeLangSet, FcCompareLang) FC_OBJECT (FONTVERSION, FcTypeInteger, FcCompareNumber) FC_OBJECT (CAPABILITY, FcTypeString, NULL) -FC_OBJECT (FONTFORMAT, FcTypeString, NULL) +FC_OBJECT (FONTFORMAT, FcTypeString, FcCompareString) FC_OBJECT (EMBOLDEN, FcTypeBool, NULL) FC_OBJECT (EMBEDDED_BITMAP, FcTypeBool, NULL) FC_OBJECT (DECORATIVE, FcTypeBool, FcCompareBool) |