* Version 2.3.12 released. ========================== Tag sources with `VER-2-3-12'. * docs/CHANGES: Updated. * docs/VERSION.DLL: Update documentation and bump version number to 2.3.12. * README, Jamfile (RefDoc), builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj, builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, builds/win32/visualce/freetype.vcproj, builds/win32/visualce/index.html, builds/wince/vc2005-ce/freetype.vcproj, builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/freetype.vcproj, builds/wince/vc2008-ce/index.html: s/2.3.11/2.3.12/, s/2311/2312/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 12. * builds/unix/configure.raw (version_info): Set to 10:0:4.

commit: b36d4192a344f26afdb6e505621e89003bb994ba [log] [tgz]
author: Werner Lemberg <wl@gnu.org> Sat Feb 13 07:57:56 2010 +0100
committer: Werner Lemberg <wl@gnu.org> Sat Feb 13 07:57:56 2010 +0100
tree: 08eabcf53af057f66555adc348bb1b80a70d00c6
parent: 129799c652db00a2e2a8a6cbc6fdc0cf4c6845c3 [diff]
diff --git a/ChangeLog b/ChangeLog
index 8dedf91..83a7d53 100644
--- a/ChangeLog
+++ b/ChangeLog

@@ -1,10 +1,40 @@
+2010-02-13  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.3.12 released.
+	==========================
+
+
+	Tag sources with `VER-2-3-12'.
+
+	* docs/CHANGES: Updated.
+
+	* docs/VERSION.DLL: Update documentation and bump version number to
+	2.3.12.
+
+	* README, Jamfile (RefDoc),
+	builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html,
+	builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html,
+	builds/win32/visualc/freetype.dsp,
+	builds/win32/visualc/freetype.vcproj,
+	builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp,
+	builds/win32/visualce/freetype.vcproj,
+	builds/win32/visualce/index.html,
+	builds/wince/vc2005-ce/freetype.vcproj,
+	builds/wince/vc2005-ce/index.html,
+	builds/wince/vc2008-ce/freetype.vcproj,
+	builds/wince/vc2008-ce/index.html: s/2.3.11/2.3.12/, s/2311/2312/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 12.
+
+	* builds/unix/configure.raw (version_info): Set to 10:0:4.
+
 2010-02-12  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	Improve autotool version checking to work with beta releases.
 
 	* autogen.sh (check_tool_version): Improve the extraction of version
-	number from "tool --version" output. Some beta releases of autotools
-	have extra strings before version number.
+	number from "tool --version" output.  Some beta releases of
+	autotools have extra strings before version number.
 
 2010-02-12  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
@@ -238,7 +268,7 @@
 
 2009-12-16  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
-	Improve configure.raw to copy some options from CFLAGS to LDFLAGS. 
+	Improve configure.raw to copy some options from CFLAGS to LDFLAGS.
 	The linker of Mac OS X 10.6 is sensitive to the architecture.  If
 	the architectures are specified explicitly for the C compiler, the
 	linker requires the architecture specifications too.
@@ -495,13 +525,13 @@
 2009-09-27  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	[cache] Fix Savannah bug #27441, clean up Redhat bugzilla #513582.
-	Tricky casts in FTC_{CACHE,GCACHE,MRULIST}_LOOKUP_CMP() are removed. 
+	Tricky casts in FTC_{CACHE,GCACHE,MRULIST}_LOOKUP_CMP() are removed.
 	Now these functions should be called with FTC_Node or FTC_MruNode
 	variable, and the caller should cast them to appropriate pointers to
 	concrete data.  These tricky casts can GCC-4.4 optimizer (-O2)
 	confused and the crashing binaries are generated.
 
-	* src/cache/ftcmru.h (FTC_MRULIST_LOOKUP_CMP): Drop tricky cast. 
+	* src/cache/ftcmru.h (FTC_MRULIST_LOOKUP_CMP): Drop tricky cast.
 	Now the 4th argument `node' of this function should be typed as
 	FTC_MruNode.
 
@@ -1052,7 +1082,7 @@
 
 	* include/freetype/internal/tttypes.h: The type
 	of TT_BDF->string_size is extended from FT_UInt32
-	to FT_ULong, because BDF specification does not 
+	to FT_ULong, because BDF specification does not
 	restrict the length of string.
 	* src/sfnt/ttbdf.c: The scratch variable `strings'
 	to load TT_BDF->string_size is matched with
@@ -1732,7 +1762,7 @@
 
 	* src/gzip/ftgzip.c (zcalloc, zcfree): Disable all
 	zcalloc() & zfree() by zlib in zutil.c, those in
-	ftgzip.c by FT2 are enabled by default.  To use 
+	ftgzip.c by FT2 are enabled by default.  To use
 	zlib zcalloc() & zfree(), define USE_ZLIB_ZCALLOC.
 	See discussion:
 	http://lists.gnu.org/archive/html/freetype-devel/2009-02/msg00000.html
@@ -1922,7 +1952,7 @@
 	the check for too large glyph.  Replace the pair of `pitch' and
 	`height' by the pair of `width' and `height'.  `pitch' cannot
 	be greater than `height'.  The required is checking the product
-	`pitch' * `height' <= FT_ULONG_MAX, but we use cheap checks for 
+	`pitch' * `height' <= FT_ULONG_MAX, but we use cheap checks for
 	the realistic case only.
 
 2009-07-09  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
@@ -2038,7 +2068,7 @@
 	Improve configure.raw for cross-building on exe-suffixed systems.
 
 	* builds/unix/configure.raw: Fix a bug in sed script to extract
-	native suffix for binary executables, patch by Peter Breitenlohner. 
+	native suffix for binary executables, patch by Peter Breitenlohner.
 	http://lists.gnu.org/archive/html/freetype-devel/2009-04/msg00036.html
 
 2009-06-26  Werner Lemberg  <wl@gnu.org>
@@ -2377,7 +2407,7 @@
 2009-04-21  Karl Berry  <karl@gnu.org>
 
 	Fix AC_CHECK_FT2.
-    
+
 	* builds/unix/freetype2.m4: Only check PATH for freetype-config if
 	we did not already find it from a prefix option.
 
@@ -2385,7 +2415,7 @@
 
 	Add #error to modules and files that do not support PIC yet.
 
-	When FT_CONFIG_OPTION_PIC is defined the following files will 
+	When FT_CONFIG_OPTION_PIC is defined the following files will
 	create #error:
 	* src/bdf/bdfdrivr.h
 	* src/cache/ftcmanag.c
@@ -2405,15 +2435,15 @@
 
 	Position Independent Code (PIC) support in autofit module.
 
-	* include/freetype/internal/autohint.h add macros to init 
+	* include/freetype/internal/autohint.h add macros to init
 	instances of FT_AutoHinter_ServiceRec.
 
-	* src/autofit/afmodule.h declare autofit_module_class 
-	using macros from ftmodapi.h, 
+	* src/autofit/afmodule.h declare autofit_module_class
+	using macros from ftmodapi.h,
 	when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/autofit/afmodule.c when FT_CONFIG_OPTION_PIC is defined 
-	af_autofitter_service and autofit_module_class structs 
+	* src/autofit/afmodule.c when FT_CONFIG_OPTION_PIC is defined
+	af_autofitter_service and autofit_module_class structs
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
 	And macros will be used from afpic.h in order to access them.
@@ -2421,54 +2451,54 @@
 	* src/autofit/aftypes.h add macros to init and declare
 	instances of AF_ScriptClassRec.
 
-	* src/autofit/afcjk.h declare af_cjk_script_class 
-	using macros from aftypes.h, 
+	* src/autofit/afcjk.h declare af_cjk_script_class
+	using macros from aftypes.h,
 	when FT_CONFIG_OPTION_PIC is defined init function will be declared.
-	* src/autofit/afcjk.c when FT_CONFIG_OPTION_PIC is defined 
-	af_cjk_script_class struct will have function to init it instead of 
+	* src/autofit/afcjk.c when FT_CONFIG_OPTION_PIC is defined
+	af_cjk_script_class struct will have function to init it instead of
 	being allocated in the global scope.
 
-	* src/autofit/afdummy.h declare af_dummy_script_class 
-	using macros from aftypes.h, 
+	* src/autofit/afdummy.h declare af_dummy_script_class
+	using macros from aftypes.h,
 	when FT_CONFIG_OPTION_PIC is defined init function will be declared.
-	* src/autofit/afdummy.c when FT_CONFIG_OPTION_PIC is defined 
-	af_dummy_script_class struct will have function to init it instead of 
+	* src/autofit/afdummy.c when FT_CONFIG_OPTION_PIC is defined
+	af_dummy_script_class struct will have function to init it instead of
 	being allocated in the global scope.
 
-	* src/autofit/afindic.h declare af_indic_script_class 
-	using macros from aftypes.h, 
+	* src/autofit/afindic.h declare af_indic_script_class
+	using macros from aftypes.h,
 	when FT_CONFIG_OPTION_PIC is defined init function will be declared.
-	* src/autofit/afindic.c when FT_CONFIG_OPTION_PIC is defined 
-	af_indic_script_class struct will have function to init it instead of 
+	* src/autofit/afindic.c when FT_CONFIG_OPTION_PIC is defined
+	af_indic_script_class struct will have function to init it instead of
 	being allocated in the global scope.
 
-	* src/autofit/aflatin.h declare af_latin_script_class 
-	using macros from aftypes.h, 
+	* src/autofit/aflatin.h declare af_latin_script_class
+	using macros from aftypes.h,
 	when FT_CONFIG_OPTION_PIC is defined init function will be declared.
-	* src/autofit/aflatin.c when FT_CONFIG_OPTION_PIC is defined 
-	af_latin_script_class struct will have function to init it instead of 
+	* src/autofit/aflatin.c when FT_CONFIG_OPTION_PIC is defined
+	af_latin_script_class struct will have function to init it instead of
 	being allocated in the global scope.
-	Change af_latin_blue_chars to be PIC-compatible by being a two 
+	Change af_latin_blue_chars to be PIC-compatible by being a two
 	dimentional array rather than array of pointers.
 
 
-	* src/autofit/aflatin2.h declare af_latin2_script_class 
-	using macros from aftypes.h, 
+	* src/autofit/aflatin2.h declare af_latin2_script_class
+	using macros from aftypes.h,
 	when FT_CONFIG_OPTION_PIC is defined init function will be declared.
-	* src/autofit/aflatin2.c when FT_CONFIG_OPTION_PIC is defined 
-	af_latin2_script_class struct will have function to init it instead of 
+	* src/autofit/aflatin2.c when FT_CONFIG_OPTION_PIC is defined
+	af_latin2_script_class struct will have function to init it instead of
 	being allocated in the global scope.
-	Change af_latin2_blue_chars to be PIC-compatible by being a two 
+	Change af_latin2_blue_chars to be PIC-compatible by being a two
 	dimentional array rather than array of pointers.
 
-	* src/autofit/afglobal.c when FT_CONFIG_OPTION_PIC is defined 
+	* src/autofit/afglobal.c when FT_CONFIG_OPTION_PIC is defined
 	af_script_classes array initialization was moved to afpic.c and
 	is later refered using macros defeined in afpic.h.
 
 	New Files:
 	* src/autofit/afpic.h declare struct to hold PIC globals for autofit
 	module and macros to access them.
-	* src/autofit/afpic.c implement functions to allocate, destroy and 
+	* src/autofit/afpic.c implement functions to allocate, destroy and
 	initialize PIC globals for autofit module.
 
 	* src/autofit/autofit.c add new file to build: afpic.c.
@@ -2478,15 +2508,15 @@
 
 	Position Independent Code (PIC) support in pshinter module.
 
-	* include/freetype/internal/pshints.h add macros to init 
+	* include/freetype/internal/pshints.h add macros to init
 	instances of PSHinter_Interface.
 
-	* src/pshinter/pshmod.h declare pshinter_module_class 
-	using macros from ftmodapi.h, 
+	* src/pshinter/pshmod.h declare pshinter_module_class
+	using macros from ftmodapi.h,
 	when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/pshinter/pshmod.c when FT_CONFIG_OPTION_PIC is defined 
-	pshinter_interface and pshinter_module_class structs 
+	* src/pshinter/pshmod.c when FT_CONFIG_OPTION_PIC is defined
+	pshinter_interface and pshinter_module_class structs
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
 	And macros will be used from pshpic.h in order to access them.
@@ -2494,7 +2524,7 @@
 	New Files:
 	* src/pshinter/pshpic.h declare struct to hold PIC globals for pshinter
 	module and macros to access them.
-	* src/pshinter/pshpic.c implement functions to allocate, destroy and 
+	* src/pshinter/pshpic.c implement functions to allocate, destroy and
 	initialize PIC globals for pshinter module.
 
 	* src/pshinter/pshinter.c add new file to build: pshpic.c.
@@ -2504,15 +2534,15 @@
 
 	Position Independent Code (PIC) support in psnames module.
 
-	* include/freetype/internal/services/svpscmap.h add macros to init 
+	* include/freetype/internal/services/svpscmap.h add macros to init
 	instances of FT_Service_PsCMapsRec.
 
-	* src/psnames/psmodule.h declare psnames_module_class 
-	using macros from ftmodapi.h, 
+	* src/psnames/psmodule.h declare psnames_module_class
+	using macros from ftmodapi.h,
 	when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/psnames/psmodule.c when FT_CONFIG_OPTION_PIC is defined 
-	pscmaps_interface and pscmaps_services structs 
+	* src/psnames/psmodule.c when FT_CONFIG_OPTION_PIC is defined
+	pscmaps_interface and pscmaps_services structs
 	and psnames_module_class array
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
@@ -2521,7 +2551,7 @@
 	New Files:
 	* src/psnames/pspic.h declare struct to hold PIC globals for psnames
 	module and macros to access them.
-	* src/psnames/pspic.c implement functions to allocate, destroy and 
+	* src/psnames/pspic.c implement functions to allocate, destroy and
 	initialize PIC globals for psnames module.
 
 	* src/psnames/psnames.c add new file to build: pspic.c.
@@ -2531,29 +2561,29 @@
 
 	Position Independent Code (PIC) support in raster renderer.
 
-	* src/raster/ftrend1.h declare ft_raster1_renderer_class 
-	and ft_raster5_renderer_class 
-	using macros from ftrender.h, 
+	* src/raster/ftrend1.h declare ft_raster1_renderer_class
+	and ft_raster5_renderer_class
+	using macros from ftrender.h,
 	when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/smooth/ftrend1.c when FT_CONFIG_OPTION_PIC is defined 
+	* src/smooth/ftrend1.c when FT_CONFIG_OPTION_PIC is defined
 	ft_raster1_renderer_class and ft_raster5_renderer_class structs
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
-	Macros will be used from rastpic.h in order to access 
+	Macros will be used from rastpic.h in order to access
 	ft_standard_raster from the pic_container (allocated in ftraster.c).
-	In ft_raster1_render when PIC is enabled, the last letter of 
+	In ft_raster1_render when PIC is enabled, the last letter of
 	module_name is used to verfy the renderer class rather than the
 	class pointer.
 
-	* src/raster/ftraster.c when FT_CONFIG_OPTION_PIC is defined 
+	* src/raster/ftraster.c when FT_CONFIG_OPTION_PIC is defined
 	ft_standard_raster struct will have function to init it
 	instead of being allocated in the global scope.
 
 	New Files:
 	* src/raster/rastpic.h declare struct to hold PIC globals for raster
 	renderer and macros to access them.
-	* src/raster/rastpic.c implement functions to allocate, destroy and 
+	* src/raster/rastpic.c implement functions to allocate, destroy and
 	initialize PIC globals for raster renderer.
 
 	* src/raster/raster.c add new file to build: rastpic.c.
@@ -2563,35 +2593,35 @@
 
 	Position Independent Code (PIC) support in smooth renderer.
 
-	* src/smooth/ftsmooth.h declare ft_smooth_renderer_class, 
-	ft_smooth_lcd_renderer_class and ft_smooth_lcd_v_renderer_class 
-	using macros from ftrender.h, 
+	* src/smooth/ftsmooth.h declare ft_smooth_renderer_class,
+	ft_smooth_lcd_renderer_class and ft_smooth_lcd_v_renderer_class
+	using macros from ftrender.h,
 	when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/smooth/ftsmooth.c when FT_CONFIG_OPTION_PIC is defined 
-	the following structs: 
-	ft_smooth_renderer_class, ft_smooth_lcd_renderer_class 
-	and ft_smooth_lcd_v_renderer_class 
+	* src/smooth/ftsmooth.c when FT_CONFIG_OPTION_PIC is defined
+	the following structs:
+	ft_smooth_renderer_class, ft_smooth_lcd_renderer_class
+	and ft_smooth_lcd_v_renderer_class
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
-	And macros will be used from ftspic.h in order to access 
+	And macros will be used from ftspic.h in order to access
 	ft_grays_raster from the pic_container (allocated in ftgrays.c).
 
 	* src/smooth/ftgrays.h include FT_CONFIG_CONFIG_H
-	* src/smooth/ftgrays.c when FT_CONFIG_OPTION_PIC is NOT defined 
-	func_interface was moved from gray_convert_glyph_inner function 
+	* src/smooth/ftgrays.c when FT_CONFIG_OPTION_PIC is NOT defined
+	func_interface was moved from gray_convert_glyph_inner function
 	to the global scope.
-	When FT_CONFIG_OPTION_PIC is defined 
+	When FT_CONFIG_OPTION_PIC is defined
 	func_interface and ft_grays_raster structs
 	will have functions to init them
 	instead of being allocated in the global scope.
-	And func_interface will be allocated on the stack of 
+	And func_interface will be allocated on the stack of
 	gray_convert_glyph_inner.
 
 	New Files:
 	* src/smooth/ftspic.h declare struct to hold PIC globals for smooth
 	renderer and macros to access them.
-	* src/smooth/ftspic.c implement functions to allocate, destroy and 
+	* src/smooth/ftspic.c implement functions to allocate, destroy and
 	initialize PIC globals for smooth renderer.
 
 	* src/smooth/smooth.c add new file to build: ftspic.c.
@@ -2601,17 +2631,17 @@
 
 	Position Independent Code (PIC) support in cff driver.
 
-	* include/freetype/internal/services/svcid.h add macros to init 
+	* include/freetype/internal/services/svcid.h add macros to init
 	instances of FT_Service_CIDRec.
-	* include/freetype/internal/services/svpsinfo.h add macros to init 
+	* include/freetype/internal/services/svpsinfo.h add macros to init
 	instances of FT_Service_PsInfoRec.
 
 	* src/cff/cffcmap.h declare cff_cmap_encoding_class_rec
 	and cff_cmap_unicode_class_rec using macros from
 	ftobjs.h, when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/cff/cffcmap.c when FT_CONFIG_OPTION_PIC is defined 
-	the following structs: 
+	* src/cff/cffcmap.c when FT_CONFIG_OPTION_PIC is defined
+	the following structs:
 	cff_cmap_encoding_class_rec and cff_cmap_unicode_class_rec
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
@@ -2619,10 +2649,10 @@
 	* src/cff/cffdrivr.h declare cff_driver_class using macros from
 	ftdriver.h, when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/cff/cffdrivr.c when FT_CONFIG_OPTION_PIC is defined 
-	the following structs: 
+	* src/cff/cffdrivr.c when FT_CONFIG_OPTION_PIC is defined
+	the following structs:
 	cff_service_glyph_dict, cff_service_ps_info, cff_service_ps_name
-	cff_service_get_cmap_info, cff_service_cid_info, cff_driver_class, 
+	cff_service_get_cmap_info, cff_service_cid_info, cff_driver_class,
 	and cff_services array
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
@@ -2634,8 +2664,8 @@
 	* src/cff/cffobjs.c Use macros from cffpic.h in order to access the
 	structs allocated in cffcmap.c
 
-	* src/cff/parser.c when FT_CONFIG_OPTION_PIC is defined 
-	implement functions to create and destroy cff_field_handlers array 
+	* src/cff/parser.c when FT_CONFIG_OPTION_PIC is defined
+	implement functions to create and destroy cff_field_handlers array
 	instead of being allocated in the global scope.
 	And macros will be used from cffpic.h in order to access it
 	from the pic_container.
@@ -2643,7 +2673,7 @@
 	New Files:
 	* src/cff/cffpic.h declare struct to hold PIC globals for cff
 	driver and macros to access them.
-	* src/cff/cffpic.c implement functions to allocate, destroy and 
+	* src/cff/cffpic.c implement functions to allocate, destroy and
 	initialize PIC globals for cff driver.
 
 	* src/cff/cff.c add new file to build: cffpic.c.
@@ -2653,38 +2683,38 @@
 
 	Position Independent Code (PIC) support in sfnt driver.
 
-	* include/freetype/internal/services/svbdf.h add macros to init 
+	* include/freetype/internal/services/svbdf.h add macros to init
 	instances of FT_Service_BDFRec.
-	* include/freetype/internal/services/svgldict.h add macros to init 
+	* include/freetype/internal/services/svgldict.h add macros to init
 	instances of FT_Service_GlyphDictRec.
-	* include/freetype/internal/services/svpostnm.h add macros to init 
+	* include/freetype/internal/services/svpostnm.h add macros to init
 	instances of FT_Service_PsFontNameRec.
-	* include/freetype/internal/services/svsfnt.h add macros to init 
+	* include/freetype/internal/services/svsfnt.h add macros to init
 	instances of FT_Service_SFNT_TableRec.
-	* include/freetype/internal/services/svttcmap.h add macros to init 
+	* include/freetype/internal/services/svttcmap.h add macros to init
 	instances of FT_Service_TTCMapsRec.
-	* include/freetype/internal/sfnt.h add macros to init 
+	* include/freetype/internal/sfnt.h add macros to init
 	instances of SFNT_Interface.
 
 	* src/sfnt/sfdriver.h declare sfnt_module_class using macros from
 	ftmodapi.h, when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/sfnt/sfdriver.c when FT_CONFIG_OPTION_PIC is defined 
-	the following structs: 
+	* src/sfnt/sfdriver.c when FT_CONFIG_OPTION_PIC is defined
+	the following structs:
 	sfnt_service_sfnt_table, sfnt_service_glyph_dict, sfnt_service_ps_name
-	tt_service_get_cmap_info, sfnt_service_bdf, sfnt_interface, 
+	tt_service_get_cmap_info, sfnt_service_bdf, sfnt_interface,
 	sfnt_module_class, and sfnt_services array
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
 	And macros will be used from sfntpic.h in order to access them
 	from the pic_container.
 
-	* src/sfnt/ttcmap.h add macros to init 
+	* src/sfnt/ttcmap.h add macros to init
 	instances of TT_CMap_ClassRec.
-	* src/sfnt/ttcmap.c when FT_CONFIG_OPTION_PIC is defined 
-	the following structs: 
+	* src/sfnt/ttcmap.c when FT_CONFIG_OPTION_PIC is defined
+	the following structs:
 	tt_cmap0_class_rec, tt_cmap2_class_rec, tt_cmap4_class_rec
-	tt_cmap6_class_rec, tt_cmap8_class_rec, tt_cmap10_class_rec, 
+	tt_cmap6_class_rec, tt_cmap8_class_rec, tt_cmap10_class_rec,
 	tt_cmap12_class_rec, tt_cmap14_class_rec and tt_cmap_classes array
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
@@ -2696,9 +2726,9 @@
 	New Files:
 	* src/sfnt/sfntpic.h declare struct to hold PIC globals for sfnt
 	driver and macros to access them.
-	* src/sfnt/sfntpic.c implement functions to allocate, destroy and 
+	* src/sfnt/sfntpic.c implement functions to allocate, destroy and
 	initialize PIC globals for sfnt driver.
-	* src/sfnt/ttcmapc.h describing the content of 
+	* src/sfnt/ttcmapc.h describing the content of
 	tt_cmap_classes allocated in ttcmap.c
 
 	* src/sfnt/sfnt.c add new file to build: sfntpic.c.
@@ -2708,30 +2738,30 @@
 
 	Position Independent Code (PIC) support in truetype driver.
 
-	* include/freetype/internal/services/svmm.h add macros to init 
+	* include/freetype/internal/services/svmm.h add macros to init
 	instances of FT_Service_MultiMastersRec.
-	* include/freetype/internal/services/svttglyf.h add macros to init 
+	* include/freetype/internal/services/svttglyf.h add macros to init
 	instances of FT_Service_TTGlyfRec.
 
 	* src/truetype/ttdriver.h declare tt_driver_class using macros from
 	ftdriver.h, when FT_CONFIG_OPTION_PIC is defined create and destroy
 	functions will be declared.
-	* src/truetype/ttdriver.c when FT_CONFIG_OPTION_PIC is defined 
-	the following structs: 
+	* src/truetype/ttdriver.c when FT_CONFIG_OPTION_PIC is defined
+	the following structs:
 	tt_service_gx_multi_masters, tt_service_truetype_glyf, tt_driver_class
-	and tt_services array, 
+	and tt_services array,
 	will have functions to init or create and destroy them
 	instead of being allocated in the global scope.
 	And macros will be used from ttpic.h in order to access them
 	from the pic_container.
 	* src/truetype/ttobjs.c change trick_names array to be
-	PIC-compatible by being a two dimentional array rather than array 
+	PIC-compatible by being a two dimentional array rather than array
 	of pointers.
 
 	New Files:
 	* src/truetype/ttpic.h declare struct to hold PIC globals for truetype
 	driver and macros to access them.
-	* src/truetype/ttpic.c implement functions to allocate, destroy and 
+	* src/truetype/ttpic.c implement functions to allocate, destroy and
 	initialize PIC globals for truetype driver.
 
 	* src/truetype/truetype.c add new file to build: ttpic.c.
@@ -2742,50 +2772,50 @@
 	Position Independent Code (PIC) support and infrastructure in base.
 
 	* include/freetype/config/ftoption.h add FT_CONFIG_OPTION_PIC
-	* include/freetype/internal/ftobjs.h Add pic_container member to 
+	* include/freetype/internal/ftobjs.h Add pic_container member to
 	FT_LibraryRec.
 	Add macros to declare and init instances of FT_CMap_ClassRec.
 	Add macros to init instances of FT_Outline_Funcs and FT_Raster_Funcs.
-	Add macros to declare, allocate and initialize modules 
+	Add macros to declare, allocate and initialize modules
 	(FT_Module_Class).
-	Add macros to declare, allocate and initialize renderers 
+	Add macros to declare, allocate and initialize renderers
 	(FT_Renderer_Class).
 	Add macro to init instances of FT_Glyph_Class.
-	Add macros to declare, allocate and initialize drivers 
+	Add macros to declare, allocate and initialize drivers
 	(FT_Driver_ClassRec).
-	* include/freetype/internal/ftpic.h new file to declare the 
+	* include/freetype/internal/ftpic.h new file to declare the
 	FT_PIC_Container struct and the functions to allocate and detroy it.
-	* include/freetype/internal/ftserv.h add macros to allocate and 
+	* include/freetype/internal/ftserv.h add macros to allocate and
 	destory arrays of FT_ServiceDescRec.
-	* include/freetype/internal/internal.h define macro to include 
+	* include/freetype/internal/internal.h define macro to include
 	ftpic.h.
 
 	New Files:
-	* src/base/ftpic.c implement functions to allocate and destory the 
+	* src/base/ftpic.c implement functions to allocate and destory the
 	global pic_container.
-	* src/base/basepic.h declare struct to hold PIC globals for base and 
+	* src/base/basepic.h declare struct to hold PIC globals for base and
 	macros to access them.
-	* src/base/basepic.c implement functions to allocate, destroy and 
+	* src/base/basepic.c implement functions to allocate, destroy and
 	initialize PIC globals for base.
 
-	* src/base/ftinit.c when FT_CONFIG_OPTION_PIC is defined implement 
-	functions that allocate and destroy ft_default_modules according to 
+	* src/base/ftinit.c when FT_CONFIG_OPTION_PIC is defined implement
+	functions that allocate and destroy ft_default_modules according to
 	FT_CONFIG_MODULES_H in the pic_container instead of the global scope
 	and use macro from basepic.h to access it.
-	* src/base/ftobjs.c add calls to the functions that allocate and 
-	destroy the global pic_container when the library is created and 
+	* src/base/ftobjs.c add calls to the functions that allocate and
+	destroy the global pic_container when the library is created and
 	destroyed.
 
-	* src/base/jamfile add new files to FT2_MULTI build: 
+	* src/base/jamfile add new files to FT2_MULTI build:
 	ftpic.c and basepic.c.
-	* src/base/ftbase.c add new files to build: 
+	* src/base/ftbase.c add new files to build:
 	ftpic.c and basepic.c.
 
-	* src/base/ftglyph.c when FT_CONFIG_OPTION_PIC is defined 
+	* src/base/ftglyph.c when FT_CONFIG_OPTION_PIC is defined
 	ft_bitmap_glyph_class and ft_outline_glyph_class will be allocated
 	in the pic_container instead of the global scope and use macros from
  	basepic.h to access them.
-	* src/base/ftbbox.c allocate bbox_interface stract on the stack 
+	* src/base/ftbbox.c allocate bbox_interface stract on the stack
 	instead of the global scope when FT_CONFIG_OPTION_PIC is defined.
 	* src/base/ftstroke.c access ft_outline_glyph_class allocated in
 	ftglyph.c via macros from basepic.h
@@ -2795,7 +2825,7 @@
 	Preparing changes in cff parser later needed for PIC version.
 
 	* src/cff/cffload.c, src/cff/cffload.h, src/cff/cffobjs.c,
-	src/cff/cffparse.c, src/cff/cffparse.h: Add library pointer to 
+	src/cff/cffparse.c, src/cff/cffparse.h: Add library pointer to
 	'CFF_ParserRec' set by `cff_parser_init'.
 	Route library pointer from 'cff_face_init' to 'cff_subfont_load'
 	for `cff_parser_init'.

diff --git a/Jamfile b/Jamfile
index ac327b8..d8c1bba 100644
--- a/Jamfile
+++ b/Jamfile

@@ -194,7 +194,7 @@
 
 actions RefDoc
 {
-  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.11 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
+  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.12 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
 }
 
 RefDoc  refdoc ;

diff --git a/README b/README
index f63c8fc..282791e 100644
--- a/README
+++ b/README

@@ -9,7 +9,7 @@
   is called `libttf'.  They are *not* compatible!
 
 
-  FreeType 2.3.11
+  FreeType 2.3.12
   ===============
 
   Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
@@ -26,9 +26,9 @@
 
   and download one of the following files.
 
-    freetype-doc-2.3.11.tar.bz2
-    freetype-doc-2.3.11.tar.gz
-    ftdoc2311.zip
+    freetype-doc-2.3.12.tar.bz2
+    freetype-doc-2.3.12.tar.gz
+    ftdoc2312.zip
 
 
   Bugs
@@ -51,7 +51,7 @@
 
 ----------------------------------------------------------------------
 
-Copyright 2006, 2007, 2008, 2009 by
+Copyright 2006, 2007, 2008, 2009, 2010 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part of  the FreeType  project, and  may only  be used,

diff --git a/autogen.sh b/autogen.sh
index 60ed3ba..c28a51c 100644
--- a/autogen.sh
+++ b/autogen.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2005, 2006, 2007, 2008, 2009 by
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,

diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 4ecd619..ff16dfe 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw

@@ -2,7 +2,7 @@
 #
 # Process this file with autoconf to produce a configure script.
 #
-# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by
+# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -17,7 +17,7 @@
 
 # Don't forget to update docs/VERSION.DLL!
 
-version_info='9:22:3'
+version_info='10:0:4'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])

diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/win32/vc2005/freetype.vcproj
index c61fd8f..3df9fda 100644
--- a/builds/win32/vc2005/freetype.vcproj
+++ b/builds/win32/vc2005/freetype.vcproj

@@ -16,7 +16,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2311.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2312.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -33,7 +33,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -50,7 +50,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2311ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2312ST.lib" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -67,7 +67,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2311_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2312_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -84,7 +84,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2311ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2312ST_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -101,7 +101,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />


diff --git a/builds/win32/vc2005/index.html b/builds/win32/vc2005/index.html
index 3c081e1..7773882 100644
--- a/builds/win32/vc2005/index.html
+++ b/builds/win32/vc2005/index.html

@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.3.11 sources:</p>
+compiles the following libraries from the FreeType 2.3.12 sources:</p>
 
 <ul>
   <pre>
-    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded</pre>
+    freetype2312.lib     - release build; single threaded
+    freetype2312_D.lib   - debug build;   single threaded
+    freetype2312MT.lib   - release build; multi-threaded
+    freetype2312MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP

diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/win32/vc2008/freetype.vcproj
index 0cd2bbc..57d0bd3 100644
--- a/builds/win32/vc2008/freetype.vcproj
+++ b/builds/win32/vc2008/freetype.vcproj

@@ -70,7 +70,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\win32\vc2008\freetype2311.lib"

+				OutputFile="..\..\..\objs\win32\vc2008\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -145,7 +145,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\win32\vc2008\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\win32\vc2008\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\win32\vc2008\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\win32\vc2008\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -292,7 +292,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\win32\vc2008\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\win32\vc2008\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -365,7 +365,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\win32\vc2008\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\win32\vc2008\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -439,7 +439,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\win32\vc2008\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\win32\vc2008\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool


diff --git a/builds/win32/vc2008/index.html b/builds/win32/vc2008/index.html
index 4157d25..aa16c38 100644
--- a/builds/win32/vc2008/index.html
+++ b/builds/win32/vc2008/index.html

@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.vcproj</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.3.11 sources:</p>
+compiles the following libraries from the FreeType 2.3.12 sources:</p>
 
 <ul>
   <pre>
-    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded</pre>
+    freetype2312.lib     - release build; single threaded
+    freetype2312_D.lib   - debug build;   single threaded
+    freetype2312MT.lib   - release build; multi-threaded
+    freetype2312MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP

diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp
index 4467919..31046c7 100644
--- a/builds/win32/visualc/freetype.dsp
+++ b/builds/win32/visualc/freetype.dsp

@@ -54,7 +54,7 @@
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"

 

@@ -78,7 +78,7 @@
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311_D.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"

 

@@ -102,8 +102,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"lib\freetype2311_D.lib"

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT_D.lib"

+# ADD BASE LIB32 /nologo /out:"lib\freetype2312_D.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT_D.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"

 

@@ -126,8 +126,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"lib\freetype2311.lib"

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT.lib"

+# ADD BASE LIB32 /nologo /out:"lib\freetype2312.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"

 

@@ -151,8 +151,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2311.lib"

-# ADD LIB32 /out:"..\..\..\objs\freetype2311ST.lib"

+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"

+# ADD LIB32 /out:"..\..\..\objs\freetype2312ST.lib"

 # SUBTRACT LIB32 /nologo

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"

@@ -177,8 +177,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2311_D.lib"

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311ST_D.lib"

+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312ST_D.lib"

 

 !ENDIF 

 


diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index 9931627..98fd295 100644
--- a/builds/win32/visualc/freetype.vcproj
+++ b/builds/win32/visualc/freetype.vcproj

@@ -69,7 +69,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype238.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -144,7 +144,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype238MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -219,7 +219,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype238ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -291,7 +291,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype238_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -364,7 +364,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype238ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -438,7 +438,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype238MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool


diff --git a/builds/win32/visualc/index.html b/builds/win32/visualc/index.html
index 7caddb0..eaf3a5c 100644
--- a/builds/win32/visualc/index.html
+++ b/builds/win32/visualc/index.html

@@ -11,14 +11,14 @@
 
 <p>This directory contains project files for Visual C++, named
 <tt>freetype.dsp</tt>, and Visual Studio, called <tt>freetype.sln</tt>.  It
-compiles the following libraries from the FreeType 2.3.11 sources:</p>
+compiles the following libraries from the FreeType 2.3.12 sources:</p>
 
 <ul>
   <pre>
-    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded</pre>
+    freetype2312.lib     - release build; single threaded
+    freetype2312_D.lib   - debug build;   single threaded
+    freetype2312MT.lib   - release build; multi-threaded
+    freetype2312MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP

diff --git a/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp
index 4467919..31046c7 100644
--- a/builds/win32/visualce/freetype.dsp
+++ b/builds/win32/visualce/freetype.dsp

@@ -54,7 +54,7 @@
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug"

 

@@ -78,7 +78,7 @@
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311_D.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Multithreaded"

 

@@ -102,8 +102,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"lib\freetype2311_D.lib"

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT_D.lib"

+# ADD BASE LIB32 /nologo /out:"lib\freetype2312_D.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT_D.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Multithreaded"

 

@@ -126,8 +126,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"lib\freetype2311.lib"

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311MT.lib"

+# ADD BASE LIB32 /nologo /out:"lib\freetype2312.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312MT.lib"

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Release Singlethreaded"

 

@@ -151,8 +151,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2311.lib"

-# ADD LIB32 /out:"..\..\..\objs\freetype2311ST.lib"

+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312.lib"

+# ADD LIB32 /out:"..\..\..\objs\freetype2312ST.lib"

 # SUBTRACT LIB32 /nologo

 

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"

@@ -177,8 +177,8 @@
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2311_D.lib"

-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2311ST_D.lib"

+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2312_D.lib"

+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2312ST_D.lib"

 

 !ENDIF 

 


diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj
index da995dd..49fb23b 100644
--- a/builds/win32/visualce/freetype.vcproj
+++ b/builds/win32/visualce/freetype.vcproj

@@ -87,7 +87,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -162,7 +162,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -237,7 +237,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -309,7 +309,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -382,7 +382,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -456,7 +456,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -534,7 +534,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -619,7 +619,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -704,7 +704,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -785,7 +785,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -867,7 +867,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -950,7 +950,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1036,7 +1036,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1121,7 +1121,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1206,7 +1206,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1287,7 +1287,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1369,7 +1369,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1452,7 +1452,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1538,7 +1538,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1623,7 +1623,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1708,7 +1708,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1789,7 +1789,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1871,7 +1871,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1954,7 +1954,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2040,7 +2040,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2125,7 +2125,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2210,7 +2210,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2291,7 +2291,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2373,7 +2373,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2456,7 +2456,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2542,7 +2542,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2627,7 +2627,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2712,7 +2712,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -2793,7 +2793,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2875,7 +2875,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2958,7 +2958,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3044,7 +3044,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311.lib"

+				OutputFile="..\..\..\objs\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3129,7 +3129,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3214,7 +3214,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -3295,7 +3295,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3377,7 +3377,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3460,7 +3460,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool


diff --git a/builds/win32/visualce/index.html b/builds/win32/visualce/index.html
index 888eeb2..f4ac494 100644
--- a/builds/win32/visualce/index.html
+++ b/builds/win32/visualce/index.html

@@ -21,14 +21,14 @@
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.3.11 sources:</p>
+It compiles the following libraries from the FreeType 2.3.12 sources:</p>
 
 <ul>
   <pre>
-    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded</pre>
+    freetype2312.lib     - release build; single threaded
+    freetype2312_D.lib   - debug build;   single threaded
+    freetype2312MT.lib   - release build; multi-threaded
+    freetype2312MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP

diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj
index 0b4a879..0830563 100644
--- a/builds/wince/vc2005-ce/freetype.vcproj
+++ b/builds/wince/vc2005-ce/freetype.vcproj

@@ -21,7 +21,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -41,7 +41,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -61,7 +61,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -81,7 +81,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -101,7 +101,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -121,7 +121,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -141,7 +141,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -161,7 +161,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -181,7 +181,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -201,7 +201,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -221,7 +221,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -241,7 +241,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -261,7 +261,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST.lib" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -281,7 +281,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST.lib" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -301,7 +301,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST.lib" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -321,7 +321,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST.lib" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -341,7 +341,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST.lib" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -361,7 +361,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST.lib" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST.lib" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -381,7 +381,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -401,7 +401,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -421,7 +421,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -441,7 +441,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -461,7 +461,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -481,7 +481,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -501,7 +501,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -521,7 +521,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -541,7 +541,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -561,7 +561,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -581,7 +581,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -601,7 +601,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311ST_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312ST_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -621,7 +621,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -641,7 +641,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -661,7 +661,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -681,7 +681,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -701,7 +701,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -721,7 +721,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -741,7 +741,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="NDEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />

@@ -758,7 +758,7 @@
       <Tool Name="VCManagedResourceCompilerTool" />

       <Tool Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" />

       <Tool Name="VCPreLinkEventTool" />

-      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2311MT_D.lib" SuppressStartupBanner="true" />

+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype2312MT_D.lib" SuppressStartupBanner="true" />

       <Tool Name="VCALinkTool" />

       <Tool Name="VCXDCMakeTool" />

       <Tool Name="VCBscMakeTool" />


diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html
index bfb049b..5d0e2b7 100644
--- a/builds/wince/vc2005-ce/index.html
+++ b/builds/wince/vc2005-ce/index.html

@@ -21,14 +21,14 @@
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.3.11 sources:</p>
+It compiles the following libraries from the FreeType 2.3.12 sources:</p>
 
 <ul>
   <pre>
-    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded</pre>
+    freetype2312.lib     - release build; single threaded
+    freetype2312_D.lib   - debug build;   single threaded
+    freetype2312MT.lib   - release build; multi-threaded
+    freetype2312MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP

diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj
index 2ba3136..8568d66 100644
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj

@@ -88,7 +88,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -177,7 +177,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -266,7 +266,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -355,7 +355,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -444,7 +444,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -533,7 +533,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -621,7 +621,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -709,7 +709,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -797,7 +797,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -885,7 +885,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -973,7 +973,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1061,7 +1061,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1149,7 +1149,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1236,7 +1236,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1323,7 +1323,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1410,7 +1410,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1497,7 +1497,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1584,7 +1584,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -1668,7 +1668,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1753,7 +1753,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1838,7 +1838,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -1923,7 +1923,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2008,7 +2008,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2093,7 +2093,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2178,7 +2178,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2263,7 +2263,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2348,7 +2348,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2433,7 +2433,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2518,7 +2518,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2603,7 +2603,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311ST_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312ST_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2689,7 +2689,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2775,7 +2775,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2861,7 +2861,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -2947,7 +2947,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3033,7 +3033,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3119,7 +3119,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3205,7 +3205,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool

@@ -3279,7 +3279,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2311MT_D.lib"

+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype2312MT_D.lib"

 				SuppressStartupBanner="true"

 			/>

 			<Tool


diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html
index f99c52b..781e05f 100644
--- a/builds/wince/vc2008-ce/index.html
+++ b/builds/wince/vc2008-ce/index.html

@@ -21,14 +21,14 @@
   <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>
 
-It compiles the following libraries from the FreeType 2.3.11 sources:</p>
+It compiles the following libraries from the FreeType 2.3.12 sources:</p>
 
 <ul>
   <pre>
-    freetype2311.lib     - release build; single threaded
-    freetype2311_D.lib   - debug build;   single threaded
-    freetype2311MT.lib   - release build; multi-threaded
-    freetype2311MT_D.lib - debug build;   multi-threaded</pre>
+    freetype2312.lib     - release build; single threaded
+    freetype2312_D.lib   - debug build;   single threaded
+    freetype2312MT.lib   - release build; multi-threaded
+    freetype2312MT_D.lib - debug build;   multi-threaded</pre>
 </ul>
 
 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP

diff --git a/docs/CHANGES b/docs/CHANGES
index 8d7387a..018d16c 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES

@@ -1,3 +1,23 @@
+CHANGES BETWEEN 2.3.11 and 2.3.12
+
+  I. IMPORTANT CHANGES
+
+    - For  `FT_Open_Face',  new  parameters  are  available  to ignore
+      preferred family names: FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY and
+      FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY.
+
+  II. MISCELLANEOUS
+
+    - Support  for  incremental  font  loading  (controlled  with  the
+      FT_CONFIG_OPTION_INCREMENTAL macro) is now active by default.
+
+    - Better support for vertical metrics.
+
+    - Various minor bug fixes.
+
+
+======================================================================
+
 CHANGES BETWEEN 2.3.10 and 2.3.11
 
   I. IMPORTANT BUG FIXES

diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL
index ac8cac8..bb55c3d 100644
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL

@@ -53,6 +53,7 @@
 
     release    libtool      so
   -------------------------------
+     2.3.12     10.0.4    6.4.0
      2.3.11     9.22.3    6.3.22
      2.3.10     9.21.3    6.3.21
      2.3.9      9.20.3    6.3.20
@@ -124,7 +125,7 @@
 
 ------------------------------------------------------------------------
 
-Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by
+Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by
 David Turner, Robert Wilhelm, and Werner Lemberg.
 
 This  file is  part  of the  FreeType  project, and  may  only be  used,

diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 9970fea..942a740 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h

@@ -3774,7 +3774,7 @@
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  3
-#define FREETYPE_PATCH  11
+#define FREETYPE_PATCH  12
 
 
   /*************************************************************************/

diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index db76b8b..b69df84 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c

@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType outline management (body).                                  */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by       */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
commit	b36d4192a344f26afdb6e505621e89003bb994ba	[log] [tgz]
author	Werner Lemberg <wl@gnu.org>	Sat Feb 13 07:57:56 2010 +0100
committer	Werner Lemberg <wl@gnu.org>	Sat Feb 13 07:57:56 2010 +0100
tree	08eabcf53af057f66555adc348bb1b80a70d00c6
parent	129799c652db00a2e2a8a6cbc6fdc0cf4c6845c3 [diff]