diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:44:18 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-11-18 11:44:18 +0100 |
| commit | 565eaac81db8c4a6408323eb861a685498753239 (patch) | |
| tree | 49aba8463776060f7de4dcb79b0fda64e77c2adc /conf/distro/include/sane-srcrevs.inc | |
| parent | 58734fc0d801df77e580c02de80c67795f230a32 (diff) | |
| parent | 8ef4ce21c67deff757093f499d5147a118c0b89d (diff) | |
| download | openembedded-565eaac81db8c4a6408323eb861a685498753239.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/merge
Conflicts:
conf/distro/include/sane-srcrevs.inc
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
recipes/linux/linux-davinci_git.bb
Diffstat (limited to 'conf/distro/include/sane-srcrevs.inc')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4027884e56..04db3cf79e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -10,6 +10,7 @@ # yes, really! # you know what that means? like... a, b, c, d, e, f, g... + SRCREV_pn-accelges ?= "206" SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" @@ -76,6 +77,7 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-ffalarms ?= "67" SRCREV_pn-flashrom ?= "3682" +SRCREV_pn-fltk2 ?= "6671" SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" SRCREV_pn-frameworkd-config-shr_SHR_REV = ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" @@ -163,7 +165,7 @@ SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5" SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9" SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12" SRCREV_pn-linux-openmoko-shr-devel ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5" -SRCREV_pn-linux-openmoko-shr-drm-devel ?= "7f45ee027a690bbdab4a7dd1530c38bc4e743e13" +SRCREV_pn-linux-openmoko-shr-drm-devel ?= "44d09f40c5c01989bb41bdefe56dd615ea49bbf8" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3" |