aboutsummaryrefslogtreecommitdiff
path: root/freetype/ChangeLog.23
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-16 19:26:40 +0000
committermarha <marha@users.sourceforge.net>2011-01-16 19:26:40 +0000
commit4e370208d0f941a4cceb6f9fefa78444c2bf3498 (patch)
tree543c693b5dee03c965b0c9ef79869a8536024432 /freetype/ChangeLog.23
parent1eaf4b3f1d746b054298358d81233364bb1b7ba2 (diff)
parent2177eb8fad173f2b0fe04f188c4d6dadaa8f4441 (diff)
downloadvcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.gz
vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.tar.bz2
vcxsrv-4e370208d0f941a4cceb6f9fefa78444c2bf3498.zip
svn merge ^/branches/released .
Diffstat (limited to 'freetype/ChangeLog.23')
-rw-r--r--freetype/ChangeLog.234
1 files changed, 2 insertions, 2 deletions
diff --git a/freetype/ChangeLog.23 b/freetype/ChangeLog.23
index 83a7d53c6..bc46c84a0 100644
--- a/freetype/ChangeLog.23
+++ b/freetype/ChangeLog.23
@@ -113,7 +113,7 @@
* include/freetype/ftsnames.h (FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY,
FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY): Define.
- * src/sfnt/sfobjs.h (sfnt_load_face): Check the arguments and
+ * src/sfnt/sfobjs.c (sfnt_load_face): Check the arguments and
ignore preferred family and subfamily names if requested.
2010-01-27 Ken Sharp <ken.sharp@artifex.com>
@@ -4525,7 +4525,7 @@
rasterizer.
* include/freetype/ftimage.h (FT_OUTLINE_SMART_DROPOUTS,
- FT_OUTLINE_EXCLUDE_STUBS): New flags for for FT_Outline.
+ FT_OUTLINE_EXCLUDE_STUBS): New flags for FT_Outline.
* src/raster/ftraster.c (Vertical_Sweep_Drop, Horizontal_Sweep_Drop,
Horizontal_Gray_Sweep_Drop): Use same mode numbers as given in the