diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
commit | 58884fc059504abafc9126613a7049464ba701e7 (patch) | |
tree | 61030608675a792923aff657516c48a6a2048693 /conf/compatibility-providers.conf | |
parent | 75820363234db9d6335997658c6f606654d1588c (diff) | |
parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
download | openembedded-58884fc059504abafc9126613a7049464ba701e7.tar.gz |
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to 'conf/compatibility-providers.conf')
-rw-r--r-- | conf/compatibility-providers.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index d2ee2b6a23..10a81f2943 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -61,7 +61,7 @@ PREFERRED_PROVIDER_virtual/gail ?= "gtk+" PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native" PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial" PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" #PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" |