pixman: Branch 'master' - 3 commits

[Søren Sandmann Pedersen]

 configure.ac      |    2 +-
 demos/Makefile.am |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3682b615154338f9754e7c1e046b42bb8ad584fa
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue May 15 13:38:44 2012 -0400

    Post-release version bump to 0.25.7

diff --git a/configure.ac b/configure.ac
index 502815e..5ff78eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 25)
-m4_define([pixman_micro], 6)
+m4_define([pixman_micro], 7)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit 1e1a00e964a1d8ef43d6d75c1c3a0b5d518d1979
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue May 15 13:20:09 2012 -0400

    Pre-release version bump to 0.25.6
    
    Note that 0.25.4 was a botched release that doesn't have a tag and
    doesn't correspond to any commit ID. It was however uploaded and
    announced, so I'll just use the 0.25.6 version number.

diff --git a/configure.ac b/configure.ac
index d949839..502815e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 25)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 6)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit b2c16aaadfae64d2573abb537bfedd92c13b8d06
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue May 15 13:19:19 2012 -0400

    demos/Makefile.am: Add parrot.c to EXTRA_DIST
    
    To get 'make distcheck' to pass.

diff --git a/demos/Makefile.am b/demos/Makefile.am
index a664d93..8f734cf 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -22,6 +22,8 @@ DEMOS =				\
 	quad2quad		\
 	checkerboard
 
+EXTRA_DIST = parrot.c
+
 gradient_test_SOURCES = gradient-test.c $(GTK_UTILS)
 alpha_test_SOURCES = alpha-test.c $(GTK_UTILS)
 composite_test_SOURCES = composite-test.c $(GTK_UTILS)