diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-27 08:58:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-27 08:58:51 +0200 |
| commit | 83cb62fe8002927ba95861a4fd21cc44c48bfcf7 (patch) | |
| tree | f90eaf2bf24e10662389e32a6877c4c95e18229d /fontconfig/src | |
| parent | e4b391377808d3a264dacdac7db76add26dee26c (diff) | |
| parent | 0feab87a4300a3e204e259d14a0a63e58e4a3c8f (diff) | |
| download | vcxsrv-83cb62fe8002927ba95861a4fd21cc44c48bfcf7.tar.gz vcxsrv-83cb62fe8002927ba95861a4fd21cc44c48bfcf7.tar.bz2 vcxsrv-83cb62fe8002927ba95861a4fd21cc44c48bfcf7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/configure.ac
apps/xwininfo/xwininfo.c
fontconfig/src/fcmatch.c
mesalib/include/GL/internal/dri_interface.h
mesalib/src/glsl/main.cpp
mesalib/src/mesa/main/pack.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
mesalib/src/mesa/state_tracker/st_draw.c
mesalib/src/mesa/state_tracker/st_format.c
pixman/configure.ac
pixman/pixman/pixman-arm-neon-asm.S
pixman/test/blitters-test.c
Diffstat (limited to 'fontconfig/src')
| -rw-r--r-- | fontconfig/src/fcmatch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index 6103ae2c9..c6bb11ef2 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -749,7 +749,7 @@ FcFontSetSort (FcConfig *config, * If this node matches any language, go check
* which ones and satisfy those entries
*/
- if (nodeps[f]->score[MATCH_LANG_INDEX] < 200)
+ if (nodeps[f]->score[MATCH_LANG_INDEX] < 2000)
{
for (i = 0; i < nPatternLang; i++)
{
|