From: Koen Kooi <koen@openembedded.org>
Date: Wed, 17 Feb 2010 22:29:06 +0000 (+0100)
Subject: angstrom: move to qt 4.6.2 and nm 7.999
X-Git-Tag: Release-2010-05/1~491^2~193
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e34626307d12cfbb9029958d38c463adeb8973e6;p=openembedded.git

angstrom: move to qt 4.6.2 and nm 7.999
---

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index c99665673b..704ec55e8d 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,4 +1,4 @@
-ANGSTROM_QT_VERSION ?= "4.6.0"
+ANGSTROM_QT_VERSION ?= "4.6.2"
 
 PREFERRED_VERSION_autoconf = "2.63"
 PREFERRED_VERSION_autoconf-native = "2.63"
@@ -27,6 +27,8 @@ PREFERRED_VERSION_mesa          = "7.6"
 PREFERRED_VERSION_mesa-dri      = "7.6"
 PREFERRED_VERSION_mesa-xlib     = "7.6"
 PREFERRED_VERSION_mplayer       = "0.0+1.0rc3+svnr30165"
+PREFERRED_VERSION_network-manager-applet = "0.7.999+git"
+PREFERRED_VERSION_networkmanager = "0.7.999"
 PREFERRED_VERSION_pango 	= "1.24.4"
 #PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"