diff options
| author |   Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-03-02 19:09:19 +0100 |
| commit | dd53c790d6c3b19bff547755f804e5f2fccc56ed (patch) | |
| tree | 592f015c44735d719e52f57c86533cbf6981ca14 /conf/distro/include/sane-srcrevs.inc | |
| parent | 6be41f1374dc9bf7f53673273d8b02bfbfe6a02e (diff) | |
| parent | b765ebc700bd5b639f70ccf2268284be624f46df (diff) | |
| download | openembedded-dd53c790d6c3b19bff547755f804e5f2fccc56ed.tar.gz | |
Merge branch 'mickey/org.openembedded.dev' into org.openembedded.dev
Conflicts:
classes/qt4e.bbclass
packages/bluez/bluez4_4.31.bb
packages/mc/mc_4.6.2.bb
packages/vte/vte.inc
packages/vte/vte_0.16.13.bb
packages/vte/vte_0.16.14.bb
Diffstat (limited to 'conf/distro/include/sane-srcrevs.inc')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b4407bdae1..4d45871af3 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -54,8 +54,8 @@ SRCREV_pn-epydial ?= "215" SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d" -SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}" +SRCREV_pn-frameworkd ?= "b652f9cc4efbccc1df941c0d93e156631879f174" +SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" SRCREV_pn-fso-abyss ?= "fc4324a328834eb55c35d1670efc53f6e8c892a1" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" @@ -66,9 +66,10 @@ SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "10302" +SRCREV_pn-gpe-conf ?= "9798" SRCREV_pn-gpe-contacts ?= "9312" +SRCREV_pn-gpe-gallery ?= "9376" SRCREV_pn-gpe-sketchbook ?= "9547" -SRCREV_pn-gpe-conf ?= "9798" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" @@ -102,8 +103,8 @@ SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1085" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" -SRCREV_pn-linux-openmoko-2.6.28 ?= "34240a1c06ae36180dee695aa25bbae869b2aa26" -SRCREV_pn-linux-openmoko-devel ?= "498d0953423a504cd24d11a0307e0ec01b81b68d" +SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5" +SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12" SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" @@ -211,7 +212,7 @@ SRCREV_pn-tslib ?= "53" SRCREV_pn-qemu-native ?= "${QEMUSRCREV}" SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" SRCREV_pn-qemu ?= "${QEMUSRCREV}" -SRCREV_pn-qi ?= "1fc83905fe99da92ff18e6ba671ee339477b1b9e" +SRCREV_pn-qi ?= "4a0243f758a38cff23f379f5a195a608e6663b8f" SRCREV_pn-remoko ?= "121" SRCREV_pn-remoko-server ?= "121" SRCREV_pn-s3c24xx-gpio ?= "4130" @@ -247,7 +248,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "39089" +EFL_SRCREV ?= "39263" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" |