summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-04 16:50:07 +0000
committerRoss Burton <ross@openedhand.com>2007-08-04 16:50:07 +0000
commitc0e5fe61b4bab56a919449f0b434547aca52c925 (patch)
tree91049eaeb8474f510c7dadf9fff5b6eb7a6adc4c /meta
parent7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b (diff)
downloadopenembedded-core-c0e5fe61b4bab56a919449f0b434547aca52c925.tar.gz
openembedded-core-c0e5fe61b4bab56a919449f0b434547aca52c925.tar.bz2
openembedded-core-c0e5fe61b4bab56a919449f0b434547aca52c925.tar.xz
openembedded-core-c0e5fe61b4bab56a919449f0b434547aca52c925.zip
Upgrade poky to glib 2.14
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2359 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky-bleeding.conf1
-rw-r--r--meta/conf/distro/poky.conf2
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index a52f5c39a..0b59df582 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 56441d431..505100982 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"