summaryrefslogtreecommitdiff
path: root/conf/distro/familiar-0.9.0.conf
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-16 10:39:43 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-16 10:39:43 +0000
commitf80a95d2b6cf850caa9c51128a3be4ab213e154a (patch)
tree48a7d4adb616f2aea2cf8f04cdbdcbef2db7dd57 /conf/distro/familiar-0.9.0.conf
parent958588c6d18a958f5d3e5ccc98fc5c1069e355f3 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/16 12:31:29+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/16 12:31:18+02:00 uni-frankfurt.de!mickeyl lock down embryo version 2005/05/16 12:30:48+02:00 uni-frankfurt.de!mickeyl repeat do_stage() in libpng-native to fix an odd packaging error on some systems 2005/05/16 11:11:48+01:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/05/16 11:11:21+01:00 rpsys.net!RP linux-oz-2.6: Tosa updates from Dirk. Also add preliminary sptiz support under 2.6 - thanks BigAl! 2005/05/16 12:10:29+02:00 utwente.nl!koen familiar-0.9.0.conf: include preferred-e-versions.inc, courtesy Buildmeister Lauer 2005/05/16 12:04:27+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/16 12:04:14+02:00 uni-frankfurt.de!mickeyl bump openzaurus-3.5.4 and lock down our e packages to my working versions through preferred-e-versions.inc 2005/05/16 12:03:24+02:00 utwente.nl!koen Added packages/thc/ dir for stuff from http://thc.org/, moved hydra and thcrut into it. 2005/05/16 10:20:43+01:00 rpsys.net!RP linux-oz-2.6: Update to later irda patch BKrev: 4288786fKHhlElesndlOW9HB4IcxyQ
Diffstat (limited to 'conf/distro/familiar-0.9.0.conf')
-rw-r--r--conf/distro/familiar-0.9.0.conf6
1 files changed, 6 insertions, 0 deletions
diff --git a/conf/distro/familiar-0.9.0.conf b/conf/distro/familiar-0.9.0.conf
index 369b112cb9..d617780940 100644
--- a/conf/distro/familiar-0.9.0.conf
+++ b/conf/distro/familiar-0.9.0.conf
@@ -42,3 +42,9 @@ PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
PREFERRED_PROVIDER_x11 = "diet-x11"
include conf/distro/preferred-gpe-versions.inc
+
+#
+# E
+#
+include conf/distro/preferred-e-versions.inc
+