diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-14 20:39:47 +0100 |
commit | 3fd04f71ad25d5df59c636986f741b9a36ce6501 (patch) | |
tree | 995f4a15764d4196a92ecd966150e38d910d57d1 /conf/distro/include/preferred-shr-versions.inc | |
parent | b5b3d83a6f3b1c04a4ebe09f636683ef22495d09 (diff) | |
parent | e426517ed76c7532434f0687f88fca1295530000 (diff) |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/linux/linux-kirkwood_2.6.33-rc1.bb
Diffstat (limited to 'conf/distro/include/preferred-shr-versions.inc')
-rw-r--r-- | conf/distro/include/preferred-shr-versions.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index c826a79131..c726e5fdf9 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -39,6 +39,3 @@ UDEV_GE_141 = "1" # Downgraded # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py PREFERRED_VERSION_python-pygtk = "2.10.4" - -# 2.0.9 tries to use /usr/include/SDL from buildhost and fails with QA Cross Compile Badness -PREFERRED_VERSION_libsdl-ttf = "2.0.3" |