summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-09-02 00:04:58 +0000
committerRod Whitby <rod@whitby.id.au>2006-09-02 00:04:58 +0000
commitd90f41da208ca1aec3b3b1e214e91381f4b1bcc1 (patch)
tree85c91888c52a6e3302248503e0bde80890da6cf0
parentdac3ac497c95432199b1437ee8aacc384402a167 (diff)
parent6a06d9f694239db1a178f6b36fff7a6fa98f9f8c (diff)
merge of 04a614aaf2494f9969f8d456330c108c6cce3b2b
and 0f6969d4ead4e00cd7af790f83f9ae1860433891
-rw-r--r--conf/distro/angstrom-2007.1.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index b7350efec7..f3ad52beca 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -27,7 +27,7 @@ FEED_URIS += " \
#SRCDATE = "20060630"
#SRCDATE_handhelds-pxa-2.6 = "20060622"
-PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh6"
+PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5"
SRCDATE_gconf-dbus = "20060719"
@@ -62,7 +62,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
-PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}"
+PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
#zap extra stuff taking place in $MACHINE.conf
GPE_EXTRA_INSTALL = ""