[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 README                  |   25 ++++++++++++++++++++++++-
 configure.ac            |    2 +-
 fontconfig/fontconfig.h |    2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit 02db01ac22318b2e296e6e1fd9664cac1ae66442
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Nov 26 17:21:14 2012 +0900

    Bump version to 2.10.2

diff --git a/README b/README
index 02f4f27..5c666b0 100644
--- a/README
+++ b/README
@@ -1,12 +1,35 @@
                               Fontconfig
              Font configuration and customization library
-                            Version 2.10.1
+                            Version 2.10.2
                               2012-03-11
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.10.2
+
+Akira TAGOH (13):
+      Bug 53585 - Two highly-visible typos in src/fcxml.c
+      Fix for libtoolize's warnings
+      Bug 54138 - X_OK permission is invalid for win32 access(..) calls
+      Bug 52573 - patch required to build 2.10.x with oldish GNU C library headers
+      deal with warnings as errors for the previous change
+      Fix wrongly squashing for the network path on Win32.
+      Fix syntax errors in fonts.dtd.
+      autogen.sh: Add -I option to tell aclocal a place for external m4 files
+      Use automake variable instead of cleaning files in clean-local
+      Bug 56531 - autogen.sh fails due to missing 'm4' directory
+      Bug 57114 - regression on FcFontMatch with namelang
+      Update CaseFolding.txt to Unicode 6.2
+      Bug 57286 - Remove UnBatang and Baekmuk Batang from monospace in 65-nonlatin.conf
+
+Behdad Esfahbod (1):
+      Fix N'ko orthography
+
+Jeremy Huddleston Sequoia (1):
+      Remove _CONFIG_FIXUPS_H_ guards, so multiple includes of "config.h" result in the correct values
+
 2.10.1
 
 Akira TAGOH (2):
diff --git a/configure.ac b/configure.ac
index 870979d..8a45737 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AM_INIT_AUTOMAKE(fontconfig, 2.10.1)
+AM_INIT_AUTOMAKE(fontconfig, 2.10.2)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index d3aeaf3..266986c 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	10
-#define FC_REVISION	1
+#define FC_REVISION	2
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))