diff options
| author | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-03-31 11:35:45 +0200 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2010-03-31 11:35:45 +0200 |
| commit | fb3a5d2a5256ffcf88e3cca17c40fe156f6bc466 (patch) | |
| tree | 54defe4afa54dee8c24851318ed9158ee61443cb /conf/distro/include | |
| parent | d59fe293e2aebd7e348d4bf743975cf685c08eaa (diff) | |
| parent | f02d3d040eb253668f9950455e1ba9c543afe018 (diff) | |
Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 20c03fef15..7fd951b1d2 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -9,7 +9,7 @@ PREFERRED_VERSION_automake-native = "1.11.1" PREFERRED_VERSION_libmikmod = "3.2.0-beta2" PREFERRED_VERSION_mtd-utils-native = "1.2.0+git" PREFERRED_VERSION_strace = "4.5.15" -PREFERRED_VERSION_mesa-dri = "7.7.999" +PREFERRED_VERSION_mesa-dri = "7.8" # We need this for jamvm PREFERRED_VERSION_classpath = "0.98" @@ -38,8 +38,8 @@ PREFERRED_VERSION_libtool-sdk = "2.2.6b" PREFERRED_VERSION_udev = "151" PREFERRED_VERSION_usbutils = "0.86" PREFERRED_VERSION_wpa-supplicant = "0.6.9" -PREFERRED_VERSION_glib-2.0 = "2.22.4" -PREFERRED_VERSION_glib-2.0-native = "2.22.4" +PREFERRED_VERSION_glib-2.0 = "2.23.6" +PREFERRED_VERSION_glib-2.0-native = "2.23.6" UDEV_GE_141 = "1" ANGSTROM_QT_VERSION ?= "4.6.2" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f64bd23b8e..34b3f92882 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -219,7 +219,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "47589" +EFL_SRCREV ?= "47617" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" |