diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-30 16:19:42 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-30 16:19:42 +0400 |
| commit | f2c65a6c54c402e013a7264aa433844be864455a (patch) | |
| tree | 8d8e63352abf1f9996ce40a4455444ad1d26220c /conf | |
| parent | e90cf71fe69917d5716fbf25846ba0e91f0b5bd7 (diff) | |
| parent | 81adc0e1ce121a1cb04ea484761920e6e79c6f25 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 704cfb2879..e613f53fae 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -44,6 +44,7 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" PREFERRED_VERSION_python = "2.6.4" +PREFERRED_VERSION_python-pycairo = "1.8.0" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fe54232020..c7b8f64d40 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -2,4 +2,4 @@ # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly OPKG_SRCREV ?= "538" -EFL_SRCREV ?= "49824" +EFL_SRCREV ?= "49934" |