From: Koen Kooi <koen@openembedded.org>
Date: Wed, 20 Apr 2005 17:13:46 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14363
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4147bed8db40e48a3ca527d24d12b88b6adcb1c8;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/04/20 19:13:33+02:00 utwente.nl!koen
preferred-gpe-versions.inc:  cairo got unbroken in cvs again

BKrev: 42668dcaNPnaqbZSivXY8r0PFeeDjw
---

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 0613087a34..01a87a4eb1 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -4,9 +4,7 @@
 
 #work around some breakages
 CVSDATE_xserver-kdrive=20050207
-CVSDATE_cairo=20050330
 CVSDATE_xext=20050222
-CVSDATE_libsvg-cairo=20050330
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf=gconf-dbus