Merge tag 'pixman-0.12.0'
authorJulien Cristau <jcristau@debian.org>
Fri, 19 Sep 2008 08:29:05 +0000 (10:29 +0200)
committerJulien Cristau <jcristau@debian.org>
Fri, 19 Sep 2008 08:29:05 +0000 (10:29 +0200)
commitd69d2705d16c813756acd8a685dc9a28a178423a
treee12acc92f616544afe30ca725ab31742ad647aa2
parentb5a9002d2e3f0d961bcfe2acee6e9a0f1c583d5d
parent412b0d5cbc2c0a5200649cbb0b5e26f8b874437d
Merge tag 'pixman-0.12.0'

Conflicts:

configure.ac