diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-12-10 19:41:34 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-12-10 19:41:34 +0100 |
| commit | 9d2716ba785a6f71a6f743be474d801add27d55b (patch) | |
| tree | 90a9e903f7cf39ee0f28c634320efdf450bfe242 /conf/distro | |
| parent | 7a8c4918691f8ba6918d88b42a3c6e26bd4f4b33 (diff) | |
| parent | 9cd6ac1c5cf557978ca796a1830cfc6e66dcfddb (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 8744cfc20a..f6afab61e9 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,7 +11,6 @@ PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.14.2" PREFERRED_VERSION_gtkmm = "2.14.1" -PREFERRED_VERSION_inputproto = "1.4.4" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libosip2 = "2.2.2" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc index cf999a2a4d..a81d5eca71 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc @@ -1,3 +1,7 @@ # This file is for updates after X11R7.4 was released PREFERRED_VERSION_xserver-xorg ?= "1.5.3" +PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0" +PREFERRED_VERSION_libxi ?= "1.2.0" +PREFERRED_VERSION_inputproto ?= "1.5.0" + |