diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-29 09:06:20 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-29 09:06:20 +0200 |
| commit | 3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8 (patch) | |
| tree | 4f945d98347a8e736e66af191c0ada59a6ad0a81 /pixman/configure.ac | |
| parent | e514bce90660eb2ec76f50af13866f84da93ec60 (diff) | |
| parent | ce592e25d6303a8f4a8aa0e2918e0f72a35bf175 (diff) | |
| download | vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.gz vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.tar.bz2 vcxsrv-3558b1795c7fa3a87e9b74cd1dfedbb2ad438ae8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
xorg-server/Xext/hashtable.c
Diffstat (limited to 'pixman/configure.ac')
| -rw-r--r-- | pixman/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 027a1680e..5c60b13c9 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], 25) -m4_define([pixman_micro], 7) +m4_define([pixman_minor], 27) +m4_define([pixman_micro], 1) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) |