Bump version to 2.11.942.11.94

3 files changed, 40 insertions, 4 deletions

diff --git a/README b/README
index 4a4dc30..8f04b9b 100644
--- a/README
+++ b/README
@@ -1,12 +1,48 @@
                               Fontconfig
              Font configuration and customization library
-                      Version 2.11.93 (2.12 RC3)
-                              2015-03-09
+                      Version 2.11.94 (2.12 RC4)
+                              2015-06-02
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.11.94 (2.12 RC4)
+
+Akira TAGOH (16):
+      Remove the dead code
+      Bug 89617 - FcConfigAppFontAddFile() returns false on any font file
+      Fix unknown attribute in Win32
+      Fix SIGFPE
+      Fix a typo for the latest cache version
+      Fix a typo in fontconfig-user.sgml
+      Drop unmaintained code
+      Observe blanks to compute correct languages in fc-query/fc-scan
+      Add missing description for usage
+      Make FC_SCALE deprecated
+      Bug 90148 - Don't warn if cachedir isn't specified
+      Fix memory leaks after FcFini()
+      Fix a typo
+      Fix a crash
+      Detect the overflow for the object ID
+      Revert the previous change
+
+Behdad Esfahbod (11):
+      Fix bitmap scaling
+      Add su[pport for symbol fonts
+      Write ranges using a [start finish) format
+      Only set FC_SIZE for scalable fonts if OS/2 version 5 is present
+      Add bitmap-only font size as Double, not Range
+      Accept Integer for FC_SIZE
+      Don't set FC_SIZE for bitmap fonts
+      Fix compiler warnings
+      Simplify FcRange
+      Reduce number of places that cache version is specified to 1
+      Bump cache version number to 6, because of recent FcRange changes
+
+Руслан Ижбулатов (1):
+      W32: Support cache paths relative to the root directory
+
 2.11.93 (2.12 RC3)
 
 Akira TAGOH (18):
diff --git a/configure.ac b/configure.ac
index bb98804..e888f2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
-AC_INIT([fontconfig], [2.11.93], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.11.94], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
 AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 128b939..a570b2f 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	11
-#define FC_REVISION	93
+#define FC_REVISION	94
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))