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

into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded

2005/04/05 17:28:55+01:00 (none)!cwiiis
Set xproto version to 6.6.2 to fix building of lib-x11 in preferred-gpe-versions.inc

BKrev: 4252bd07JhFP4Gc3MJjDSrzJj48aUg

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 51b07e2..98c1a96 100644 (file)
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -27,6 +27,7 @@ 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_xproto ?= "6.6.2"
 PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
 PREFERRED_VERSION_rxvt-unicode ?= "5.3"
 PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"