Merge
authorMichael Lauer <mickey@vanille-media.de>
Sun, 18 Jul 2004 10:10:24 +0000 (10:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 18 Jul 2004 10:10:24 +0000 (10:10 +0000)
commitcea4341f5c75295284291633e99558df215241b2
treee9d728ce4e992fea9cc0d5632135860345ce8c37
parent4c1f1e75585608113bf6e8cd2e188a6725d9dec2
Merge

2004/07/18 10:44:30+01:00 (none)!chris
opie-mediaplayer1-libtremorplugin_cvs.oe:
  Depend on 'tremor' instead of 'libtremor', which doesn't exist

2004/07/17 21:01:54-05:00 (none)!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into odin.(none):/home/kergoth/code/packages

2004/07/17 21:00:04-05:00 (none)!kergoth
Make CONFIG_SITE look based on ARCH and OS directly, not SYS, to avoid VENDOR
affecting test result availability.

BKrev: 40fa4c90qx9jLKQt_qNmpXdb6TGPjA
conf/oe.conf
site/i686-linux [moved from site/i686-oe-linux with 100% similarity]
site/i686-linux-uclibc [moved from site/i686-oe-linux-uclibc with 100% similarity]