diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-04 15:50:53 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-04 15:50:53 +0200 |
| commit | 2208b42bea7850513d9df8f1edbfad1df083c5ad (patch) | |
| tree | f5205d71dbc42803c6853888f5f69c2ad4dfdd22 /conf/distro/include | |
| parent | e02161e5582a182d8a3b672ad91fc27843f1a438 (diff) | |
| parent | bcd5894dcd9db9234dd6d99a9e1bd0d6d8fef19a (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 83cf820f9b..8e0fbc00fb 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -6,8 +6,8 @@ PREFERRED_VERSION_cairo = "1.8.0" PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" -PREFERRED_VERSION_glib-2.0 = "2.22.0" -PREFERRED_VERSION_glib-2.0-native = "2.22.0" +PREFERRED_VERSION_glib-2.0 = "2.22.1" +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" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ce6e4bceb1..3b4fb8f302 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -30,7 +30,6 @@ SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" SRCREV_pn-clutter ?= "3240" SRCREV_pn-comic-reader ?= "54" -SRCREV_pn-connman ?= "103706c4f4da0c89f8b6f33cccdc3149f4ecc09a" SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" SRCREV_pn-dbus-c++-native ?= "13131" @@ -137,8 +136,6 @@ SRCREV_pn-navit ?= "1096" SRCREV_pn-neod ?= "4617" SRCREV_pn-net-snmp ?= "17367" SRCREV_pn-netsurf ?= "3859" -SRCREV_pn-networkmanager ?= "3202" -SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-numptyphysics ?= "109" SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e" SRCREV_pn-om-locations ?= "942e88a1b689ffe3f11a2d982cce389cc965b2ec" @@ -237,7 +234,7 @@ 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 ?= "45825" +SRCREV_pn-webkit-gtk ?= "48579" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "5394" |