Upgrade poky to glib 2.14

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

2 files changed, 1 insertions, 2 deletions

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index a52f5c39ad..0b59df5823 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1,3 @@
-PREFERRED_VERSION_glib-2.0 ?= "2.14.0"
 PREFERRED_VERSION_pango ?= "1.17.5"
 PREFERRED_VERSION_gtk+ ?= "2.11.6"
 
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 56441d4319..5051009828 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -142,7 +142,7 @@ PREFERRED_VERSION_gtk-sato-engine = "0.1"
 PREFERRED_VERSION_matchbox-theme-sato = "0.1"
 PREFERRED_VERSION_sato-icon-theme = "0.1"
 
-PREFERRED_VERSION_glib-2.0 ?= "2.12.13"
+PREFERRED_VERSION_glib-2.0 ?= "2.14.0"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
 PREFERRED_VERSION_atk ?= "1.18.0"
 PREFERRED_VERSION_cairo ?= "1.4.10"