aboutsummaryrefslogtreecommitdiff
path: root/pixman/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-11-09 13:28:28 +0100
committermarha <marha@users.sourceforge.net>2012-11-09 13:28:28 +0100
commit19b61957dbf473cddbae72792ddeeaee4d4a7077 (patch)
tree0839a8b0cc9c6ea5f3ae63cc34726d4ef936995d /pixman/configure.ac
parent480a7a0a6c9a8fae5b8fc7b7688173d5e425ae0e (diff)
parent8d57b7fcb22cf1a52203ee57c745b64bba649249 (diff)
downloadvcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.gz
vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.tar.bz2
vcxsrv-19b61957dbf473cddbae72792ddeeaee4d4a7077.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa git update 9 nov 2012
Diffstat (limited to 'pixman/configure.ac')
-rw-r--r--pixman/configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac
index 44ae5bf8e..45b709dcf 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
#
m4_define([pixman_major], 0)
-m4_define([pixman_minor], 27)
-m4_define([pixman_micro], 5)
+m4_define([pixman_minor], 29)
+m4_define([pixman_micro], 1)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])