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 0613087..01a87a4 100644 (file)
--- 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