* Version 2.6.1 released.

========================= Tag sources with `VER-2-6-1'. * docs/VERSION.DLL: Update documentation and bump version number to 2.6.1. * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, builds/windows/vc2005/index.html, builds/windows/vc2008/freetype.vcproj, builds/windows/vc2008/index.html, builds/windows/vc2010/freetype.vcxproj, builds/windows/vc2010/index.html, builds/windows/visualc/freetype.dsp, builds/windows/visualc/freetype.vcproj, builds/windows/visualc/index.html, builds/windows/visualce/freetype.dsp, builds/windows/visualce/freetype.vcproj, builds/windows/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.6/2.6.1/, s/26/261/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. * builds/unix/configure.raw (version_info): Set to 18:1:12. * CMakeLists.txt (VERSION_PATCH): Set to 1. * src/autofit/afmodule.c [AF_DEBUG_AUTOFIT]: Ensure C linking for dumping functions.
2015-10-04 08:18:01 +02:00 · 2015-10-04 08:18:01 +02:00 · 8cabd919ca
parent b260dc9fab
commit 8cabd919ca
26 changed files with 286 additions and 254 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -139,7 +139,7 @@ endif ()

 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "6")
-set(VERSION_PATCH "0")
+set(VERSION_PATCH "1")

 set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
--- a/42
+++ b/42
@ -1,4 +1,40 @@
-2015-10-03  Werner Lemberg  <wl@gnu.org>
+2015-10-04  Werner Lemberg  <wl@gnu.org>
+
+	* Version 2.6.1 released.
+	=========================
+
+
+	Tag sources with `VER-2-6-1'.
+
+	* docs/VERSION.DLL: Update documentation and bump version number to
+	2.6.1.
+
+	* README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj,
+	builds/windows/vc2005/index.html,
+	builds/windows/vc2008/freetype.vcproj,
+	builds/windows/vc2008/index.html,
+	builds/windows/vc2010/freetype.vcxproj,
+	builds/windows/vc2010/index.html,
+	builds/windows/visualc/freetype.dsp,
+	builds/windows/visualc/freetype.vcproj,
+	builds/windows/visualc/index.html,
+	builds/windows/visualce/freetype.dsp,
+	builds/windows/visualce/freetype.vcproj,
+	builds/windows/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.6/2.6.1/, s/26/261/.
+
+	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.
+
+	* builds/unix/configure.raw (version_info): Set to 18:1:12.
+	* CMakeLists.txt (VERSION_PATCH): Set to 1.
+
+	* src/autofit/afmodule.c [AF_DEBUG_AUTOFIT]: Ensure C linking for
+	dumping functions.
+
+2015-10-04  Werner Lemberg  <wl@gnu.org>

 	[bzip2, gzip] Avoid access of unitialized memory (#46109).

@ -1098,8 +1134,8 @@
 	(FREETYPE_PATCH): Set to 0.

 	* builds/unix/configure.raw (version_info): Set to 18:0:12.
-	* CMakeLists.txt (VERSION_MINOR): Set to 0.
-	(VERSION_PATCH): Set to 6.
+	* CMakeLists.txt (VERSION_MINOR): Set to 6.
+	(VERSION_PATCH): Set to 0.

 	* src/autofit/afmodule.c [!FT_MAKE_OPTION_SINGLE_OBJECT]: Add
 	declarations for dumping functions.
--- a/2
+++ b/2
@ -197,7 +197,7 @@ actions RefDoc
 {
  python $(FT2_SRC)/tools/docmaker/docmaker.py
         --prefix=ft2
-         --title=FreeType-2.6
+         --title=FreeType-2.6.1
         --output=$(DOC_DIR)
         $(FT2_INCLUDE)/freetype/*.h
         $(FT2_INCLUDE)/freetype/config/*.h
--- a/10
+++ b/10
@ -1,5 +1,5 @@
-  FreeType 2.6
-  ============
+  FreeType 2.6.1
+  ==============

  Homepage: http://www.freetype.org

@ -24,9 +24,9 @@

  and download one of the following files.

-    freetype-doc-2.6.tar.bz2
-    freetype-doc-2.6.tar.gz
-    ftdoc26.zip
+    freetype-doc-2.6.1.tar.bz2
+    freetype-doc-2.6.1.tar.gz
+    ftdoc261.zip

  To view the documentation online, go to

--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in])

 # Don't forget to update docs/VERSION.DLL!

-version_info='18:0:12'
+version_info='18:1:12'
 AC_SUBST([version_info])
 ft_version=`echo $version_info | tr : .`
 AC_SUBST([ft_version])
--- 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\freetype26.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261.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\freetype26.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261.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\freetype26.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261.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\freetype26.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261.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\freetype26.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261.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\freetype26.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261.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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT.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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT.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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT.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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT.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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT.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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT.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\freetype26ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST.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\freetype26ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST.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\freetype26ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST.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\freetype26ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST.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\freetype26ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST.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\freetype26ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST.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\freetype26_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261_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\freetype26_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261_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\freetype26_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261_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\freetype26_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261_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\freetype26_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261_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\freetype26_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261_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\freetype26ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST_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\freetype26ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST_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\freetype26ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST_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\freetype26ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST_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\freetype26ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST_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\freetype26ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261ST_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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT_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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT_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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT_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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT_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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT_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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT_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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT.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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\wince\vc2005-ce\freetype261MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
--- a/builds/wince/vc2005-ce/index.html
+++ b/builds/wince/vc2005-ce/index.html
@ -21,22 +21,22 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>

-It compiles the following libraries from the FreeType 2.6 sources:</p>
+It compiles the following libraries from the FreeType 2.6.1 sources:</p>

 <ul>
  <pre>
-    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded</pre>
+    freetype261.lib     - release build; single threaded
+    freetype261_D.lib   - debug build;   single threaded
+    freetype261MT.lib   - release build; multi-threaded
+    freetype261MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
 tool to convert the line endings.  For example, with <a
-href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
-file smart CR/LF Conversion</it> option.  Alternatively, you may consider
+href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
+file smart CR/LF Conversion</em> option.  Alternatively, you may consider
 using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
 around, which specifically deal with this particular problem.

--- 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\freetype26.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -177,7 +177,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -266,7 +266,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -444,7 +444,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -533,7 +533,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -621,7 +621,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -709,7 +709,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -797,7 +797,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -885,7 +885,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -973,7 +973,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1061,7 +1061,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1149,7 +1149,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1236,7 +1236,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1323,7 +1323,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1410,7 +1410,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1497,7 +1497,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1584,7 +1584,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1668,7 +1668,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1753,7 +1753,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1838,7 +1838,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1923,7 +1923,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2008,7 +2008,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2093,7 +2093,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2178,7 +2178,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2263,7 +2263,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2348,7 +2348,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2433,7 +2433,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2518,7 +2518,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2603,7 +2603,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2689,7 +2689,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2775,7 +2775,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2861,7 +2861,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2947,7 +2947,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3033,7 +3033,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3119,7 +3119,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3205,7 +3205,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3279,7 +3279,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\wince\vc2008-ce\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/builds/wince/vc2008-ce/index.html
+++ b/builds/wince/vc2008-ce/index.html
@ -21,22 +21,22 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>

-It compiles the following libraries from the FreeType 2.6 sources:</p>
+It compiles the following libraries from the FreeType 2.6.1 sources:</p>

 <ul>
  <pre>
-    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded</pre>
+    freetype261.lib     - release build; single threaded
+    freetype261_D.lib   - debug build;   single threaded
+    freetype261MT.lib   - release build; multi-threaded
+    freetype261MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
 tool to convert the line endings.  For example, with <a
-href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
-file smart CR/LF Conversion</it> option.  Alternatively, you may consider
+href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
+file smart CR/LF Conversion</em> option.  Alternatively, you may consider
 using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
 around, which specifically deal with this particular problem.

--- a/builds/windows/vc2005/freetype.vcproj
+++ b/builds/windows/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\freetype26.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261.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\freetype26MT.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261MT.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\freetype26ST.lib" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261ST.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\freetype26_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261_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\freetype26ST_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261ST_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\freetype26MT_D.lib" SuppressStartupBanner="true" />
+      <Tool Name="VCLibrarianTool" OutputFile="..\..\..\objs\win32\vc2005\freetype261MT_D.lib" SuppressStartupBanner="true" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
--- a/builds/windows/vc2005/index.html
+++ b/builds/windows/vc2005/index.html
@ -11,22 +11,22 @@

 <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.6 sources:</p>
+compiles the following libraries from the FreeType 2.6.1 sources:</p>

 <ul>
  <pre>
-    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded</pre>
+    freetype261.lib     - release build; single threaded
+    freetype261_D.lib   - debug build;   single threaded
+    freetype261MT.lib   - release build; multi-threaded
+    freetype261MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
 tool to convert the line endings.  For example, with <a
-href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
-file smart CR/LF Conversion</it> option.  Alternatively, you may consider
+href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
+file smart CR/LF Conversion</em> option.  Alternatively, you may consider
 using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
 around, which specifically deal with this particular problem.

--- a/builds/windows/vc2008/freetype.vcproj
+++ b/builds/windows/vc2008/freetype.vcproj
@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype26.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -145,7 +145,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype26MT.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -220,7 +220,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype26ST.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -292,7 +292,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype26_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -365,7 +365,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -439,7 +439,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\win32\vc2008\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\win32\vc2008\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/builds/windows/vc2008/index.html
+++ b/builds/windows/vc2008/index.html
@ -11,22 +11,22 @@

 <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.6 sources:</p>
+compiles the following libraries from the FreeType 2.6.1 sources:</p>

 <ul>
  <pre>
-    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded</pre>
+    freetype261.lib     - release build; single threaded
+    freetype261_D.lib   - debug build;   single threaded
+    freetype261MT.lib   - release build; multi-threaded
+    freetype261MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
 tool to convert the line endings.  For example, with <a
-href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
-file smart CR/LF Conversion</it> option.  Alternatively, you may consider
+href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
+file smart CR/LF Conversion</em> option.  Alternatively, you may consider
 using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
 around, which specifically deal with this particular problem.

--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@ -191,18 +191,18 @@
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype26d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype26d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype26MTd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype26MTd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype26STd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">freetype26STd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype26</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype26</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype26MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype26MT</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype26ST</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">freetype26ST</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">freetype261d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">freetype261d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">freetype261MTd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">freetype261MTd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">freetype261STd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'">freetype261STd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">freetype261</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">freetype261</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">freetype261MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'">freetype261MT</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">freetype261ST</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'">freetype261ST</TargetName>
  </PropertyGroup>
  <Import Project="$(SolutionDir)\freetype.user.props" Condition="exists('$(SolutionDir)\freetype.user.props')" Label="UserProperties" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--- a/builds/windows/vc2010/index.html
+++ b/builds/windows/vc2010/index.html
@ -12,16 +12,16 @@
 <p>This directory contains a project file for Visual C++ (VS.NET&nbsp;2010
 or newer), named <tt>freetype.vcxproj</tt>, and Visual Studio, called
 <tt>freetype.sln</tt>.  It compiles the following libraries from the
-FreeType 2.6 sources:</p>
+FreeType 2.6.1 sources:</p>

 <ul>
  <pre>
-freetype26.lib     - release build
-freetype26d.lib    - debug build
-freetype26ST.lib   - release build; single threaded
-freetype26STd.lib  - debug build;   single threaded
-freetype26MT.lib   - release build; multi-threaded
-freetype26MTd.lib  - debug build;   multi-threaded</pre>
+    freetype261.lib    - release build
+    freetype261d.lib   - debug build
+    freetype261ST.lib  - release build; single threaded
+    freetype261STd.lib - debug build;   single threaded
+    freetype261MT.lib  - release build; multi-threaded
+    freetype261MTd.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Both Win32 and x64 builds are supported.</p>
--- a/builds/windows/visualc/freetype.dsp
+++ b/builds/windows/visualc/freetype.dsp
@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261.lib"

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

@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261_D.lib"

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

@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype26_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype261_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT_D.lib"

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

@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype26.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype261.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT.lib"

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

@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype26ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype261ST.lib"
 # SUBTRACT LIB32 /nologo

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261ST_D.lib"

 !ENDIF

--- a/builds/windows/visualc/freetype.vcproj
+++ b/builds/windows/visualc/freetype.vcproj
@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -144,7 +144,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -219,7 +219,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -364,7 +364,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -438,7 +438,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/builds/windows/visualc/index.html
+++ b/builds/windows/visualc/index.html
@ -11,22 +11,22 @@

 <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.6 sources:</p>
+compiles the following libraries from the FreeType 2.6.1 sources:</p>

 <ul>
  <pre>
-    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded</pre>
+    freetype261.lib     - release build; single threaded
+    freetype261_D.lib   - debug build;   single threaded
+    freetype261MT.lib   - release build; multi-threaded
+    freetype261MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
 tool to convert the line endings.  For example, with <a
-href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
-file smart CR/LF Conversion</it> option.  Alternatively, you may consider
+href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
+file smart CR/LF Conversion</em> option.  Alternatively, you may consider
 using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
 around, which specifically deal with this particular problem.

--- a/builds/windows/visualce/freetype.dsp
+++ b/builds/windows/visualce/freetype.dsp
@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261.lib"

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

@ -78,7 +78,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261_D.lib"

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

@ -102,8 +102,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype26_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype261_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT_D.lib"

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

@ -126,8 +126,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"lib\freetype26.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype261.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261MT.lib"

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

@ -151,8 +151,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype26ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype261ST.lib"
 # SUBTRACT LIB32 /nologo

 !ELSEIF  "$(CFG)" == "freetype - Win32 Debug Singlethreaded"
@ -177,8 +177,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype26_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype26ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype261_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype261ST_D.lib"

 !ENDIF

--- a/builds/windows/visualce/freetype.vcproj
+++ b/builds/windows/visualce/freetype.vcproj
@ -87,7 +87,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -162,7 +162,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -237,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -309,7 +309,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -382,7 +382,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -456,7 +456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -534,7 +534,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -619,7 +619,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -704,7 +704,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -785,7 +785,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -867,7 +867,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -950,7 +950,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1036,7 +1036,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1121,7 +1121,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1206,7 +1206,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1287,7 +1287,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1369,7 +1369,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1452,7 +1452,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1538,7 +1538,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1623,7 +1623,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1708,7 +1708,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -1789,7 +1789,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1871,7 +1871,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -1954,7 +1954,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2040,7 +2040,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2125,7 +2125,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2210,7 +2210,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -2291,7 +2291,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2373,7 +2373,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2456,7 +2456,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2542,7 +2542,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2627,7 +2627,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2712,7 +2712,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -2793,7 +2793,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2875,7 +2875,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -2958,7 +2958,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3044,7 +3044,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26.lib"
+				OutputFile="..\..\..\objs\freetype261.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3129,7 +3129,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT.lib"
+				OutputFile="..\..\..\objs\freetype261MT.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3214,7 +3214,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST.lib"
+				OutputFile="..\..\..\objs\freetype261ST.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@ -3295,7 +3295,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26_D.lib"
+				OutputFile="..\..\..\objs\freetype261_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3377,7 +3377,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26ST_D.lib"
+				OutputFile="..\..\..\objs\freetype261ST_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
@ -3460,7 +3460,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\..\..\objs\freetype26MT_D.lib"
+				OutputFile="..\..\..\objs\freetype261MT_D.lib"
 				SuppressStartupBanner="true"
 			/>
 			<Tool
--- a/builds/windows/visualce/index.html
+++ b/builds/windows/visualce/index.html
@ -21,22 +21,22 @@ the following targets:
  <li>PPC/SP WM6 (Windows Mobile 6)</li>
 </ul>

-It compiles the following libraries from the FreeType 2.6 sources:</p>
+It compiles the following libraries from the FreeType 2.6.1 sources:</p>

 <ul>
  <pre>
-    freetype26.lib     - release build; single threaded
-    freetype26_D.lib   - debug build;   single threaded
-    freetype26MT.lib   - release build; multi-threaded
-    freetype26MT_D.lib - debug build;   multi-threaded</pre>
+    freetype261.lib     - release build; single threaded
+    freetype261_D.lib   - debug build;   single threaded
+    freetype261MT.lib   - release build; multi-threaded
+    freetype261MT_D.lib - debug build;   multi-threaded</pre>
 </ul>

 <p>Be sure to extract the files with the Windows (CR+LF) line endings.  ZIP
 archives are already stored this way, so no further action is required.  If
 you use some <tt>.tar.*z</tt> archives, be sure to configure your extracting
 tool to convert the line endings.  For example, with <a
-href="http://www.winzip.com">WinZip</a>, you should activate the <it>TAR
-file smart CR/LF Conversion</it> option.  Alternatively, you may consider
+href="http://www.winzip.com">WinZip</a>, you should activate the <em>TAR
+file smart CR/LF Conversion</em> option.  Alternatively, you may consider
 using the <tt>unix2dos</tt> or <tt>u2d</tt> utilities that are floating
 around, which specifically deal with this particular problem.

--- a/docs/CHANGES
+++ b/docs/CHANGES
@ -3,9 +3,9 @@ CHANGES BETWEEN 2.6 and 2.6.1
  I. IMPORTANT BUG FIXES

    - It turned  out that for CFFs  only the advance widths  should be
-      taken  from  the  `htmx',  not the  side  bearings.   This  bug,
+      taken from the  `htmx' table, not the side  bearings.  This bug,
      introduced in  version 2.6.0, makes  it necessary to  upgrade if
-      you are  using CFFs; otherwise  you get cropped glyphs  with GUI
+      you are using  CFFs; otherwise, you get cropped  glyphs with GUI
      interfaces like GTK or Qt.

    - Accessing Type 42 fonts returned  incorrect results if the glyph
@ -19,13 +19,13 @@ CHANGES BETWEEN 2.6 and 2.6.1
      header files except `ft2build.h' into a subdirectory tree.

      Doing so  reduces the  possibility of  header file  name clashes
-      (e.g., FTGL's  `FTGlyph.h' with  FreeType's `ftglyph.h'  on case
-      insensitive file systems like Mac OS X or Windows).
+      (e.g., FTGL's  `FTGlyph.h' with FreeType's `ftglyph.h')  on case
+      insensitive file systems like Mac OS X or Windows.

-      Applications  that  use   (a)  `freetype-config'  or  FreeType's
-      `freetype2.pc' file for pkg-config  to get the include directory
-      for  the  compiler,  and  (b)  the  documented  way  for  header
-      inclusion like
+      Applications  that  use  (a)  the  `freetype-config'  script  or
+      FreeType's `freetype2.pc' file for pkg-config to get the include
+      directory  for the  compiler,  and (b)  the  documented way  for
+      header inclusion like

        #include <ft2build.h>
        #include FT_FREETYPE_H
@ -35,7 +35,7 @@ CHANGES BETWEEN 2.6 and 2.6.1

    - Simple access  to named instances  in GX variation fonts  is now
      available (in addition to the  previous method via FreeType's MM
-      interface).   In  the  FT_Face  structure,  bits  16-30  of  the
+      interface).   In  the `FT_Face'  structure,  bits  16-30 of  the
      `face_index' field hold the current named instance index for the
      given face  index, and bits  16-30 of `style_flags'  contain the
      number of  instances for  the given face  index.  `FT_Open_Face'
@ -67,7 +67,7 @@ CHANGES BETWEEN 2.6 and 2.6.1
    - The  function  `FT_FloorFix'  now always  rounds  towards  minus
      infinity.

-    - A new  load flag `FT_LOAD_COMPUTE_METRICS' is  now available; it
+    - A  new load  flag `FT_LOAD_COMPUTE_METRICS'  has been  added; it
      makes FreeType  ignore pre-computed  metrics, as needed  by font
      validating  or  font  editing  programs.  Right  now,  only  the
      TrueType  module supports  it  to ignore  data  from the  `hdmx'
--- a/docs/VERSION.DLL
+++ b/docs/VERSION.DLL
@ -45,13 +45,14 @@ The  release  number   is  also  available  at   *runtime*  through  the
 2. History
 ----------

-The  following   table  gives,  for   all  releases  since   2.3.0,  the
+The  following   table  gives,  for   all  releases  since   2.4.0,  the
 corresponding libtool number, as well  as the shared object number found
 on _most_ systems, but not all of them:


    release     libtool     so
  -------------------------------
+     2.6.1      18.1.12   6.12.1
     2.6.0      18.0.12   6.12.0
     2.5.5      17.4.11   6.11.4
     2.5.4      17.3.11   6.11.3
@ -72,19 +73,6 @@ on _most_ systems, but not all of them:
     2.4.2      12.0.6    6.6.0
     2.4.1      11.1.5    6.5.1
     2.4.0      11.0.5    6.5.0
-     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
-     2.3.8      9.19.3    6.3.19
-     2.3.7      9.18.3    6.3.18
-     2.3.6      9.17.3    6.3.17
-     2.3.5      9.16.3    6.3.16
-     2.3.4      9.15.3    6.3.15
-     2.3.3      9.14.3    6.3.14
-     2.3.2      9.13.3    6.3.13
-     2.3.1      9.12.3    6.3.12
-     2.3.0      9.11.3    6.3.11


 3. Autoconf Code Fragment
--- a/docs/freetype-config.1
+++ b/docs/freetype-config.1
@ -1,4 +1,4 @@
-.TH FREETYPE-CONFIG 1 "June 2015" "FreeType 2.6"
+.TH FREETYPE-CONFIG 1 "October 2015" "FreeType 2.6.1"
 .
 .
 .SH NAME
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@ -4093,7 +4093,7 @@ FT_BEGIN_HEADER
   */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  6
-#define FREETYPE_PATCH  0
+#define FREETYPE_PATCH  1


  /*************************************************************************/
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@ -25,6 +25,10 @@
 #ifdef FT_DEBUG_AUTOFIT

 #ifndef FT_MAKE_OPTION_SINGLE_OBJECT
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
  extern void
  af_glyph_hints_dump_segments( AF_GlyphHints  hints,
                                FT_Bool        to_stdout );
@ -34,6 +38,10 @@
  extern void
  af_glyph_hints_dump_edges( AF_GlyphHints  hints,
                             FT_Bool        to_stdout );
+#ifdef __cplusplus
+  }
+#endif
+
 #endif

  int  _af_debug_disable_horz_hints;