diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-07-16 09:24:30 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-07-16 09:24:30 +0000 |
| commit | c02b12845098ea158f4b22e949f4a966e82314a7 (patch) | |
| tree | 85a53586ec22458febd56c631fc333bd916eaab9 /conf | |
| parent | 2f11ba39ea6f6f5c239cfec189bb567404e54958 (diff) | |
| parent | 3099e5f9471bf2612f39dc6faa9998e679c62351 (diff) | |
merge of '027df8bfceecb5d21ab2b2b76d0d191124b3446b'
and 'daafad010cbf738246a5e77122c2e1e4f951c9f5'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index c411149cd9..9043345134 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -21,7 +21,6 @@ SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}" SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index a9fbb3067d..a03f42fe0d 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1555,8 +1555,8 @@ PREFERRED_VERSION_python-pymp3 ?= "0.3.4" PREFERRED_VERSION_python-pyrad ?= "0.8" PREFERRED_VERSION_python-pyraf ?= "1.4" PREFERRED_VERSION_python-pyreverse ?= "0.5.2" -PREFERRED_VERSION_python-pyrex ?= "0.9.5.1a" -PREFERRED_VERSION_python-pyrex-native ?= "0.9.5.1a" +PREFERRED_VERSION_python-pyrex ?= "0.9.8" +PREFERRED_VERSION_python-pyrex-native ?= "0.9.8" PREFERRED_VERSION_python-pyro ?= "3.7" PREFERRED_VERSION_python-pyserial ?= "2.2" PREFERRED_VERSION_python-pytester ?= "0.6.0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 10a0330f17..f248a81bba 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE ?= "20080610" +EFL_SRCDATE ?= "20080716" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" |