summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorrjt@cambridgebroadband.com <rjt@cambridgebroadband.com>2005-02-16 12:36:57 +0000
committerrjt@cambridgebroadband.com <rjt@cambridgebroadband.com>2005-02-16 12:36:57 +0000
commit4290b613f71cbd6e2d9fc6d6813ed64151d9f96c (patch)
tree0829079e0e6be1d00924b9c415bd9cef0b3da641 /conf
parentff3c451c2b63c3865400384f36c0397ec3563d92 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into flotta.cambridgebroadband.com:/development/openembedded/openembedded 2005/02/16 12:36:23+00:00 cambridgebroadband.com!rjt up OZ CVSDATE, set xserver-kdrive to use 20050208 2005/02/16 11:22:47+00:00 cambridgebroadband.com!rjt bugfix to make power key suspend BKrev: 42133e69QfQxPSSWpzQBUQNMW2AAQQ
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openzaurus-3.5.3.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index ffe4832a6b..c39c62a22a 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
console##http://openzaurus.org/official/unstable/3.5.2/feed/console \
devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
-CVSDATE = "20050213"
+CVSDATE = "20050215"
#
# Zaurus
@@ -47,6 +47,7 @@ include conf/distro/preferred-opie-versions.inc
# GPE
#
+CVSDATE_xserver-kdrive = "20050208"
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"