From: Keith Packard <keithp@keithp.com>
Date: Sat, 29 May 2004 19:36:32 +0000 (+0000)
Subject: Update for 2.2.95
X-Git-Tag: fc-2_2_95~1
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d81271eb21db058d0e816044874b3a8b88439e82;p=fontconfig.git

Update for 2.2.95
---

diff --git a/ChangeLog b/ChangeLog
index 756bffc..4f120fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-29  Keith Packard  <keithp@keithp.com>
+
+	* README:
+	* configure.in:
+	* fontconfig/fontconfig.h:
+	Update for 2.2.95
+
 2004-05-29  Keith Packard  <keithp@keithp.com>
 
 	* fontconfig/fontconfig.h:
diff --git a/README b/README
index 8e9b731..bea578f 100644
--- a/README
+++ b/README
@@ -1,7 +1,14 @@
 			Fontconfig
 	Font configuration and customization library
-		      Version 2.2.94
-		        2004-4-23
+		      Version 2.2.95
+		        2004-5-29
+
+2.2.95
+
+Add FcResultOutOfMemory so FcFontSetMatch can return accurate error.
+
+Replace MIN/MAX/ABS macros which happened to be in old FreeType releases
+with FC_MIN/FC_MAX/FC_ABS macros owned by fontconfig.
 
 2.2.94
 
diff --git a/configure.in b/configure.in
index de03087..f4b4cc2 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.2.94)
+AM_INIT_AUTOMAKE(fontconfig, 2.2.95)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 225ce75..8028d02 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -40,7 +40,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	2
-#define FC_REVISION	94
+#define FC_REVISION	95
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))