pixman: Branch 'master' - 2 commits

[Julien Cristau]

 0 files changed

New commits:
commit d69d2705d16c813756acd8a685dc9a28a178423a
Merge: b5a9002... 412b0d5...
Author: Julien Cristau <jcristau at debian.org>
Date:   Fri Sep 19 10:29:05 2008 +0200

    Merge tag 'pixman-0.12.0'
    
    Conflicts:
    
    	configure.ac

commit 412b0d5cbc2c0a5200649cbb0b5e26f8b874437d
Author: Søren Sandmann Pedersen <sandmann at daimi.au.dk>
Date:   Wed Sep 17 14:03:23 2008 -0400

    Pre-release version bump

diff --git a/configure.ac b/configure.ac
index 3821dcc..eb8879c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,8 @@ AC_PREREQ([2.57])
 #
 
 m4_define([pixman_major], 0)
-m4_define([pixman_minor], 11)
-m4_define([pixman_micro], 10)
+m4_define([pixman_minor], 12)
+m4_define([pixman_micro], 0)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])