diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-29 13:58:50 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-29 13:58:50 +0100 |
| commit | 98bdd580d03fa37c9feb16ecb10577c469c873df (patch) | |
| tree | cea0a9bfe3de25e460b879d66229d876d4aa5685 /conf | |
| parent | 642fe896f9a69051fd9dfe69cffa7809d339a057 (diff) | |
| parent | 21fb30fa23351a576ebf1246d9c2bd8bb1a95d26 (diff) | |
Merge branch 'holger/openmoko-merges' into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 3d3c3858e0..43bdc8f259 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -648,7 +648,7 @@ PREFERRED_VERSION_gvim ?= "7.0" PREFERRED_VERSION_gweled ?= "0.5" PREFERRED_VERSION_gxine ?= "0.4.1enhanced" PREFERRED_VERSION_gzip ?= "1.3.5" -PREFERRED_VERSION_hal ?= "0.5.9" +PREFERRED_VERSION_hal ?= "0.5.11" PREFERRED_VERSION_hal-info ?= "20080508" PREFERRED_VERSION_haserl ?= "0.8.0" PREFERRED_VERSION_havp ?= "0.86" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index da791ff4c5..aa0f82322d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,6 +14,7 @@ SRCREV_pn-accelges ?= "206" SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6" +SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "217" SRCREV_pn-assassin-thumbnail ?= "4513" SRCREV_pn-bfin-uclibc ?= "1857" @@ -146,6 +147,7 @@ SRCREV_pn-openmoko-panel-memory ?= "3903" SRCREV_pn-openmoko-panel-usb ?= "3360" SRCREV_pn-openmoko-panel-wifi ?= "4344" SRCREV_pn-openmoko-sample2 ?= "3537" +SRCREV_pn-openmoko-set-root-password ?= "4590" SRCREV_pn-openmoko-sound-theme-standard2 ?= "4271" SRCREV_pn-openmoko-tasks2 ?= "399" SRCREV_pn-openmoko-terminal2 ?= "4726" |