summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-09-08 19:34:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-09-08 19:34:50 +0000
commit67a821524c05794cee8c26d3d2c7236ce8bc2f8e (patch)
treec8a33ef84f1c2db617b3c6ef378da032b9555652
parent97b021ece5247b0a0956b63ad8830f20d67eaab2 (diff)
parent00fa38c08d45c3a921a6276e7ce85f5259695310 (diff)
merge of '5a77ab41b3385a039d9e0696c7d69b01aad3ad92'
and 'a40851440ffc312af9c5719717490a99603b8d29'
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index ebdca4a416..6a3498a6b2 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -4,7 +4,8 @@ PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_glib-2.0 = "2.16.4"
+PREFERRED_VERSION_glib-2.0 = "2.18.0"
+PREFERRED_VERSION_glib-2.0-native = "2.18.0"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_gtk+ = "2.12.11"
PREFERRED_VERSION_libsdl-x11 = "1.2.11"
@@ -12,7 +13,7 @@ PREFERRED_VERSION_libtool = "2.2.4"
PREFERRED_VERSION_libtool-native = "2.2.4"
PREFERRED_VERSION_libtool-cross = "2.2.4"
PREFERRED_VERSION_libtool-sdk = "2.2.4"
-PREFERRED_VERSION_pango = "1.18.3"
+PREFERRED_VERSION_pango = "1.20.5"
PREFERRED_VERSION_pixman = "0.11.8"
PREFERRED_VERSION_pkgconfig = "0.23"
PREFERRED_VERSION_pkgconfig-native = "0.23"