From: Chris Lord <chris@openedhand.com>
Date: Tue, 5 Apr 2005 12:26:29 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~14512
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f16b42bbaaeabda022ec119a5b43bd498e7dd1a9;p=openembedded.git

Merge

2005/04/05 13:24:19+01:00 (none)!cwiiis
Fix small error with preferred version of minimo in preferred-gpe-versions.inc

2005/04/04 20:15:05+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/03 23:51:36+01:00 (none)!cwiiis
Merge

2005/04/03 23:49:24+01:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

BKrev: 425283f54FWWksMEFsu4yJ_FN9ReBw
---

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 75b8d64358..e18a0ba20a 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -78,7 +78,7 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1"
 PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
 PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"
-PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
 PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
 PREFERRED_VERSION_linphone ?= "0.12.2"
 PREFERRED_VERSION_firefox ?= "1.0"