Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/03/03 20:33:05+01:00 (none)!koen
preferred-gpe-versions.inc:
  comment diet-x11 version to unbreak builds

BKrev: 42276681TShyRB2s9L81HHKRC4SUUg

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index dbcf9d5..feae12f 100644 (file)
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -21,7 +21,7 @@ PREFERRED_VERSION_libgpevtype = "0.11"
 PREFERRED_VERSION_libschedule = "0.14"
 PREFERRED_VERSION_gpe-icons = "0.24"
 PREFERRED_VERSION_libgsm = "1.0.10"
-PREFERRED_VERSION_diet-x11 = "6.2.1"
+#PREFERRED_VERSION_diet-x11 = "6.2.1"
 PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
 PREFERRED_VERSION_rxvt-unicode = "4.8"
 PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"