[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 README                  |    6 ++++--
 configure.in            |    2 +-
 fontconfig/fontconfig.h |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit a93b4c2aab1d79573abd646147596a8a34b19350
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 31 19:24:35 2008 -0700

    Bump version to 2.6.0

diff --git a/README b/README
index f012a0c..205aea4 100644
--- a/README
+++ b/README
@@ -1,12 +1,14 @@
                               Fontconfig
              Font configuration and customization library
-                       Version 2.5.93 (2.6 RC3)
-                              2008-05-24
+                              Version 2.6
+                              2008-05-31
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.6
+
 2.5.93 (2.6 RC3)
 
 Alexey Khoroshilov (1):
diff --git a/configure.in b/configure.in
index 29f109b..e2e3f06 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,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.5.93)
+AM_INIT_AUTOMAKE(fontconfig, 2.6.0)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 425fc2d..cd650a1 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,8 +52,8 @@ typedef int		FcBool;
  */
 
 #define FC_MAJOR	2
-#define FC_MINOR	5
-#define FC_REVISION	93
+#define FC_MINOR	6
+#define FC_REVISION	0
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))