diff options
author | Graeme Gregory <dp@xora.org.uk> | 2008-06-16 11:18:00 +0000 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2008-06-16 11:18:00 +0000 |
commit | 92a95e65fd8a2ff4b324c512879811701cf40209 (patch) | |
tree | 85206e89f73897376d42ae29e678051aa284cef8 | |
parent | 3981575226bc2a1f5aaaf829139005e443eec8ba (diff) | |
parent | dc22b05108d2c2f7e173b1c30a8189c7b10b07db (diff) |
merge of '5f8c61f539e6f103dcfa53a341944eb1b46c96fe'
and '5fc614e5aaeec54eb6667a7a09ba920551217a7f'
-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, 2 insertions, 2 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index b86a6f90bb..bfa3689e7a 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1476,7 +1476,7 @@ PREFERRED_VERSION_proj-4-native ?= "4.9" PREFERRED_VERSION_psmisc ?= "22.2" PREFERRED_VERSION_psplash-zap ?= "1.0" PREFERRED_VERSION_pth ?= "2.0.2" -PREFERRED_VERSION_pulseaudio ?= "0.9.9" +PREFERRED_VERSION_pulseaudio ?= "0.9.10" PREFERRED_VERSION_puppy ?= "1.11" PREFERRED_VERSION_puzz-le ?= "2.0.0" PREFERRED_VERSION_puzzles ?= "r7436" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 0cd23c21bd..e3d50fc52c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -156,7 +156,7 @@ SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" SRCREV_pn-opkg ?= "4488" -SRCREV_pn-opkg-native ?= "4452" +SRCREV_pn-opkg-native ?= "4488" SRCREV_pn-opkg-sdk ?= "4488" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" |