diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2010-01-26 21:38:55 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2010-01-26 21:38:55 +0000 |
| commit | 5e31507429db43fbf2faf0d783a7fb6d40e4e74c (patch) | |
| tree | 3e74b6a33e76e343a61a8827994de4f666254e62 | |
| parent | 3c54a2110cc24f2d2628cee55e904afe9e7554bf (diff) | |
| parent | c22971693aa963a31753b61666299e5982cc3e79 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.org/openembedded into org.openembedded.dev
| -rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 39b1f0764e..6bf62d064b 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -27,13 +27,15 @@ PREFERRED_VERSION_openssh = "5.2p1" # upgrades used in Angstrom PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_hal = "0.5.13" -PREFERRED_VERSION_libtool = "2.2.6a" -PREFERRED_VERSION_libtool-native = "2.2.6a" -PREFERRED_VERSION_libtool-cross = "2.2.6a" -PREFERRED_VERSION_libtool-sdk = "2.2.6a" +PREFERRED_VERSION_libtool = "2.2.6b" +PREFERRED_VERSION_libtool-native = "2.2.6b" +PREFERRED_VERSION_libtool-cross = "2.2.6b" +PREFERRED_VERSION_libtool-sdk = "2.2.6b" PREFERRED_VERSION_udev = "141" PREFERRED_VERSION_usbutils = "0.82" PREFERRED_VERSION_wpa-supplicant = "0.6.9" +PREFERRED_VERSION_glib-2.0 = "2.22.4" +PREFERRED_VERSION_glib-2.0-native = "2.22.4" UDEV_GE_141 = "1" ANGSTROM_QT_VERSION ?= "4.6.0" |