summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-06-16 11:12:58 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-06-16 11:12:58 +0000
commitdc22b05108d2c2f7e173b1c30a8189c7b10b07db (patch)
tree785661b7d8f4a2788eb499235280c79ea77ff092
parent84f9800efbfe76049ca1b2faeb27831cad5bb72d (diff)
parente71beeec1ee1088b0bbcca60870cc940311e6749 (diff)
merge of '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
and '3b2129cbd868ae2da323fb4418c0120038a9d33f'
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
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"