aboutsummaryrefslogtreecommitdiffstats
path: root/conf/distro/include/preferred-xorg-versions-live.inc
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
committerCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
commit3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch)
tree642c13416b99e80f0871cdc6668e832e635dfb48 /conf/distro/include/preferred-xorg-versions-live.inc
parentc400c874f2ac9233b8a43a73309b6e7907289c54 (diff)
parent13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff)
downloadopenembedded-testing.tar.gz
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'conf/distro/include/preferred-xorg-versions-live.inc')
-rw-r--r--conf/distro/include/preferred-xorg-versions-live.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index c38580e81e..06662e371c 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Mon Nov 1 07:54:05 CET 2010
+#Thu Nov 4 08:29:11 CET 2010
#app
PREFERRED_VERSION_appres ?= "1.0.3"
PREFERRED_VERSION_bdftopcf ?= "1.0.3"
@@ -130,7 +130,7 @@ PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
PREFERRED_VERSION_xf86-input-mouse ?= "1.6.0"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.1+gitr%"
PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
PREFERRED_VERSION_xf86-input-penmount ?= "1.4.1"
PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
@@ -264,7 +264,7 @@ PREFERRED_VERSION_libxfont ?= "1.4.3"
PREFERRED_VERSION_libxfont-native ?= "1.4.3"
PREFERRED_VERSION_libxfontcache ?= "1.0.5"
PREFERRED_VERSION_libxft ?= "2.2.0"
-PREFERRED_VERSION_libxi ?= "1.3.2"
+PREFERRED_VERSION_libxi ?= "1.4.0"
PREFERRED_VERSION_libxinerama ?= "1.1.1"
PREFERRED_VERSION_libxmu ?= "1.1.0"
PREFERRED_VERSION_libxp ?= "1.0.0"
@@ -340,8 +340,8 @@ PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
PREFERRED_VERSION_xineramaproto ?= "1.2"
-PREFERRED_VERSION_xproto ?= "7.0.18"
-PREFERRED_VERSION_xproto-native ?= "7.0.18"
+PREFERRED_VERSION_xproto ?= "7.0.19"
+PREFERRED_VERSION_xproto-native ?= "7.0.19"
PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
#util
PREFERRED_VERSION_gccmakedep ?= "1.0.2"