diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-13 12:23:25 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-12-13 12:23:25 +0000 |
| commit | 8fc8bc3b10da16da6174e42c15d4377757a2b923 (patch) | |
| tree | c95967c0d6ca033bd173cf9152bfcffbdb92989b /conf | |
| parent | 9bb32b78d06986d7ca89070e476fb923dc5e6023 (diff) | |
| parent | 704fafa6aaeb82cf39068fc80decd8dfac31a9e6 (diff) | |
merge of '14a147908792e6213800ab92d6cfc1d77dbe07b4'
and 'bd9716558226c1049f7159d28c7f245818a2471f'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 10 |
3 files changed, 10 insertions, 6 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index afa2a95e2b..dc1b06316f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -7806,6 +7806,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 +[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2] +md5=391f85b4f962269e044ceac2b5235310 +sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f + [http://venge.net/monotone/downloads/monotone-0.20.tar.gz] md5=3bdf4da35ff576a401483815952f4045 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93 diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 43cadd36a7..12138d0f13 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.12" +PREFERRED_VERSION_midori ?= "0.0.13" PREFERRED_VERSION_midpath ?= "0.1" PREFERRED_VERSION_midpath-alsa ?= "0.1" PREFERRED_VERSION_midpath-cldc ?= "0.1" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a65f477296..dff8d89328 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -62,7 +62,7 @@ SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appearance ?= "3239" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" -SRCREV_pn-openmoko-browser2 ?= "3249" +SRCREV_pn-openmoko-browser2 ?= "3646" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "3235" SRCREV_pn-openmoko-common ?= "397" @@ -73,7 +73,7 @@ SRCREV_pn-openmoko-dates ?= "467" SRCREV_pn-openmoko-dates2 ?= "661" SRCREV_pn-openmoko-dialer ?= "2811" SRCREV_pn-openmoko-dialer2 ?= "3522" -SRCREV_pn-openmoko-feedreader2 ?= "3080" +SRCREV_pn-openmoko-feedreader2 ?= "3645" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" @@ -121,9 +121,9 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-webkit-gtk ?= "27222" -SRCREV_pn-webkit-qt ?= "27222" -SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-webkit-gtk ?= "28656" +SRCREV_pn-webkit-qt ?= "28656" +SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" |