aboutsummaryrefslogtreecommitdiff
path: root/freetype/builds/unix/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-20 08:28:36 +0000
committermarha <marha@users.sourceforge.net>2010-08-20 08:28:36 +0000
commitf5d6fd32902e742cc62622b1abc8826dd7c03c32 (patch)
tree96c33069543f425f5f70045e24b549a5783c73d1 /freetype/builds/unix/configure.ac
parent3799f1085abb02c5721f4c33f42c063edb68029d (diff)
parent00666832a756014eef48c4f5bd8484cc1299bdf0 (diff)
downloadvcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.gz
vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.tar.bz2
vcxsrv-f5d6fd32902e742cc62622b1abc8826dd7c03c32.zip
svn merge ^/branches/released .
Diffstat (limited to 'freetype/builds/unix/configure.ac')
-rw-r--r--freetype/builds/unix/configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/freetype/builds/unix/configure.ac b/freetype/builds/unix/configure.ac
index 1a237d5e2..6ffddd069 100644
--- a/freetype/builds/unix/configure.ac
+++ b/freetype/builds/unix/configure.ac
@@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it
# fully.
-AC_INIT([FreeType], [2.4.1], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.4.2], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.in])
# Don't forget to update docs/VERSION.DLL!
-version_info='11:1:5'
+version_info='12:0:6'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])