diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-04 12:57:51 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-04 12:57:51 +0100 |
| commit | 62ccf71524bf776d2693b5ef6dcdce923b066fe4 (patch) | |
| tree | f6cb2d6ce28c39f7da5e2436c9bdafbce9979248 /conf/distro/shr.conf | |
| parent | 28ea7f5aa9c0e204ec0eb2513b555ff379750b7e (diff) | |
| parent | df97d3b01e30c89fa24d9ec618d50bfbcab4e362 (diff) | |
| download | openembedded-62ccf71524bf776d2693b5ef6dcdce923b066fe4.tar.gz | |
Merge branch 'shr/merge' into TESTINGRC
Conflicts:
conf/distro/include/sane-srcrevs.inc
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'conf/distro/shr.conf')
| -rw-r--r-- | conf/distro/shr.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index f205165f26..c4fe79ebf2 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -184,6 +184,7 @@ PREFERRED_PROVIDER_virtual/db-native = "db3-native" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" +DISTRO_apm = "fso-apm" ############################################################################# # PREFERRED VERSIONS |