summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-03-20 12:34:27 +0000
committerKoen Kooi <koen@openembedded.org>2008-03-20 12:34:27 +0000
commitce09099588da37235a4652f4014794b4bde51188 (patch)
treea17eb2f1bed2116e56bb1e3214f7b8b1cc39c6e5 /conf
parent7d91312121b91165cc2f06274b9530508b375a10 (diff)
parent1d3831c1bfcac4dbca2d500fbcc99ed6b9a3393e (diff)
merge of '3b3bdcaa9ad2328f02f412cfd58e88c216486d47'
and '808c0f3bcbe784d70daee61bfb6f464d0072147f'
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2008.1.conf1
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc1
2 files changed, 0 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 7d69484e91..a78469c3d1 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -81,7 +81,6 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ ?= "2.12.3"
PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
-PREFERRED_VERSION_pango ?= "1.18.1"
PREFERRED_PROVIDER_avahi = "avahi"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 912bb72c7d..a26c53173d 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -5,4 +5,3 @@ PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_vte = "0.16.10"