From: Ross Burton <ross@openedhand.com>
Date: Wed, 1 Aug 2007 14:53:30 +0000 (+0000)
Subject: Sync with poky
X-Git-Tag: 2011-1~11126
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4e75063ff3f4f0205ff7c7281f453b54b558ec3e;p=openembedded-core.git

Sync with poky

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2291 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index ce37687275..0153674833 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,9 +1,9 @@
-PREFERRED_VERSION_glib-2.0 ?= "2.12.11"
+PREFERRED_VERSION_glib-2.0 ?= "2.12.13"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 
 PREFERRED_VERSION_cairo ?= "1.4.8"
 PREFERRED_VERSION_pango ?= "1.16.4"
-PREFERRED_VERSION_gtk+ ?= "2.10.12"
+PREFERRED_VERSION_gtk+ ?= "2.10.14"
 PREFERRED_VERSION_gtk-engines ?= "2.10.0"
 
 require conf/distro/poky.conf