summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-06 16:10:30 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-06 16:10:30 +0000
commitf60997f5a23ce7f9e1c9ace5dd52bdb22d5cbb68 (patch)
treee7c1a52debfaea1f989adc5057eff88ef0930f26
parentc5718e16d08d73a48642840dd8ad532734fb5942 (diff)
parentf22b368f756c2e165b3a015da98a02232d77cef2 (diff)
merge of '44147c36bbb2a3438d57b6293a393355eeffc48b'
and 'b9301fc2fdf0a9d64d686b1bcffc18be39655752'
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 3615bb965c..103adb051e 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -986,7 +986,6 @@ PREFERRED_VERSION_libpcl ?= "1.4"
PREFERRED_VERSION_libpcre ?= "4.4"
PREFERRED_VERSION_libpcre-native ?= "4.4"
PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
-PREFERRED_VERSION_libpixman ?= "0.9.6"
PREFERRED_VERSION_libpng ?= "1.2.20"
PREFERRED_VERSION_libpng-native ?= "1.2.20"
PREFERRED_VERSION_libpthread-stubs ?= "0.1"
@@ -1442,7 +1441,7 @@ PREFERRED_VERSION_pine ?= "4.64"
PREFERRED_VERSION_pipeman ?= "1.0.0"
PREFERRED_VERSION_pipepanic ?= "0.1.1"
PREFERRED_VERSION_pivotinit ?= "1.0.0"
-PREFERRED_VERSION_pixman ?= "0.9.6"
+PREFERRED_VERSION_pixman ?= "0.10.0"
PREFERRED_VERSION_pixops-test ?= "1.0"
PREFERRED_VERSION_pkgconfig ?= "0.22"
PREFERRED_VERSION_pkgconfig-native ?= "0.22"