diff options
author | marha <marha@users.sourceforge.net> | 2012-03-09 10:39:43 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-09 10:39:43 +0100 |
commit | f7eb7329c8efe023b304d5e66b08d1a998973220 (patch) | |
tree | 290de7865db558d7c85ba03e735e4a135ae69aab /pixman/configure.ac | |
parent | ceca11a64938e803d2e0d8ccfc030357c3a0121c (diff) | |
parent | d483a0007d3a25fbf565436f655fa45b4265628a (diff) | |
download | vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.tar.gz vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.tar.bz2 vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_in.c
Diffstat (limited to 'pixman/configure.ac')
-rw-r--r-- | pixman/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 5eeb6a54e..17e30f5e4 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -54,7 +54,7 @@ AC_PREREQ([2.57]) m4_define([pixman_major], 0) m4_define([pixman_minor], 25) -m4_define([pixman_micro], 1) +m4_define([pixman_micro], 3) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) |