diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-29 10:43:34 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-29 10:43:34 +0100 |
| commit | 2012861d8154cd0241d8a3e1ab57b485006284dc (patch) | |
| tree | 2d0a30200cf0752301ac25f5e35cd27d399941f4 /conf/distro | |
| parent | 1ca106793e669980354fa9c32fe931bb7a72b070 (diff) | |
| parent | 31c440b89cf2f9002bc8df2f69a34b4948f0d0de (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 36c556a679..3098101d7f 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,7 +11,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1" PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.18.0" +PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" @@ -28,8 +28,8 @@ PREFERRED_VERSION_pango = "1.24.4" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_python = "2.6.1" -PREFERRED_VERSION_samba = "3.3.0" +PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "141" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f4cb5f4d61..2f22a7d91d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -232,7 +232,6 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" -SRCREV_pn-webkit-gtk ?= "48579" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "5394" |