diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-03-05 16:52:01 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-05 16:52:01 +0000 |
| commit | b63eeefdc195007d494f73316fb205857161c1db (patch) | |
| tree | 2561dab250a228f9dfbbbf876195aaa03b29fd4a /conf/distro | |
| parent | 3b74cf7e4b032778ece9b86c4ef7432405bd9f71 (diff) | |
| parent | 66a28b5eeec400962e615a0225befdada529b094 (diff) | |
merge of '8fb06f47da36b8b2158bea8339a80be10a144e3c'
and 'a064a0293b3a138710553a3fa279c7f690061da8'
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-2007-for-openmoko-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc index ef97eae09a..700af88653 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko-versions.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc @@ -1111,8 +1111,8 @@ PREFERRED_VERSION_libxres ?= "1.0.3" PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" PREFERRED_VERSION_libxsettings ?= "0.11" PREFERRED_VERSION_libxsettings-client ?= "0.17" -PREFERRED_VERSION_libxslt ?= "1.1.21" -PREFERRED_VERSION_libxslt-native ?= "1.1.21" +PREFERRED_VERSION_libxslt ?= "1.1.22" +PREFERRED_VERSION_libxslt-native ?= "1.1.22" PREFERRED_VERSION_libxt ?= "1.0.5" PREFERRED_VERSION_libxtrap ?= "1.0.0" PREFERRED_VERSION_libxtst ?= "1.0.3" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 119be23ad2..2c9543abd9 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,5 +1,5 @@ PREFERRED_VERSION_busybox = "1.9.1" -PREFERRED_VERSION_dbus = "1.1.4" +PREFERRED_VERSION_dbus = "1.1.20" PREFERRED_VERSION_glib-2.0 = "2.15.6" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a666b42a65..b5a04deab8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -154,5 +154,5 @@ SRCREV_pn-webkit-gtk ?= "30762" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" -SRCREV_pn-xoo ?= "1623" +SRCREV_pn-xoo ?= "1971" |