summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorKlaus Kurzmann <mok@fluxnetz.de>2009-12-13 20:17:29 +0100
committerKlaus Kurzmann <mok@fluxnetz.de>2009-12-13 20:17:29 +0100
commit5e133e2a50fd32187d16334efe7a5315633fd687 (patch)
tree5885e39c6a8b0fc12f38ef192fd0fbacc6adaed9 /conf/distro
parent91f546068cc31ad59cf9094da28cc3d3438c97b4 (diff)
parent9f65815c37fff6c2ad9438b84f6ce866c5c44f73 (diff)
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 7cc923cc60..d881202b09 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02"
PREFERRED_VERSION_confuse ?= "2.5"
PREFERRED_VERSION_confuse-native ?= "2.5"
PREFERRED_VERSION_connect ?= "0.1"
-PREFERRED_VERSION_connman ?= "0.10"
+PREFERRED_VERSION_connman ?= "0.15"
PREFERRED_VERSION_conserver ?= "8.1.14"
PREFERRED_VERSION_console-tools ?= "0.3.2"
PREFERRED_VERSION_contacts ?= "0.7"
@@ -1963,7 +1963,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
PREFERRED_VERSION_wmctrl ?= "1.07"
PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.6.3"
+PREFERRED_VERSION_wpa-supplicant ?= "0.6.9"
PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"