diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-05-28 10:09:40 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-05-28 10:09:40 +0200 |
| commit | cc2eccd9c67c534a3fb8184148d57a5d22540217 (patch) | |
| tree | 2494e4456c50ea8787544343954c67f66c96f6c0 /conf/distro/include | |
| parent | 99dd85f176d8dbc1f81ed96b8bd2409ba3dbcd32 (diff) | |
| parent | 3c4e35bd4385607d581734014b3857467292abad (diff) | |
Merge branch 'org.openembedded.dev' of git@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 | 3 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 3b7905c284..a7c7f4cd58 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -26,5 +26,8 @@ PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "141" +PREFERRED_VERSION_util-macros-native = "1.2.1" +PREFERRED_VERSION_util-macros = "1.2.1" PREFERRED_VERSION_wpa-supplicant = "0.6.7" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" +PREFERRED_VERSION_xserver-xorg = "1.6.1" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8d2bc93359..4d7c257de2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -13,7 +13,7 @@ SRCREV_pn-accelges ?= "206" SRCREV_pn-aircrack-ng ?= "802" -SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6" +SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" |