From 702e8f786a8d48bcfa18724008240161249fe75d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 10 May 2005 23:39:52 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/10 23:21:12+01:00 rpsys.net!RP Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/oe/openembedded 2005/05/10 23:20:48+01:00 rpsys.net!RP linux-openzaurus-2.6: enable more modules 2005/05/11 00:09:43+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/11 00:08:44+02:00 uni-frankfurt.de!mickeyl fix dependency in task-xfce-base. xfce-image builds now. lets see if it works... 2005/05/10 19:13:14+02:00 uni-frankfurt.de!mickeyl openzaurus-3.5.4.conf: bump cvsdate and add preferred provider for x11 BKrev: 42814648SkcG-hRt59QRBq5XfBL0jQ --- conf/distro/openzaurus-3.5.4.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index cd315e4cba..1bac374c3e 100644 --- a/conf/distro/openzaurus-3.5.4.conf +++ b/conf/distro/openzaurus-3.5.4.conf @@ -13,7 +13,7 @@ FEED_URIS += " \ console##http://openzaurus.org/official/unstable/3.5.3/feed/console \ devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel" -CVSDATE = "20050504" +CVSDATE = "20050510" # # Zaurus @@ -48,6 +48,6 @@ include conf/distro/preferred-opie-versions.inc # PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" - +PREFERRED_PROVIDER_x11 = "diet-x11" include conf/distro/preferred-gpe-versions.inc -- cgit v1.2.3