diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-02-17 09:32:24 +0059 |
---|---|---|
committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-02-17 09:32:24 +0059 |
commit | dca56bfaec558069cd8efe7b1c1c8286c2560807 (patch) | |
tree | 50eaad28fe2a0a03ff35b1b567c3d90caf82aa1b | |
parent | c9492e8caa58ef7b3f2b09d5307aa0267e941da4 (diff) | |
parent | 707ad469b97aebf83485f5f7df9ff4a5387f82b2 (diff) |
Merge branch 'linaro_android_4.0.3' of git://android.git.linaro.org/platform/manifest into linaro_android_4.0.3
-rw-r--r-- | default.xml | 2 | ||||
-rw-r--r-- | landing-panda.xml | 2 | ||||
-rw-r--r-- | landing-snowball.xml | 2 | ||||
-rw-r--r-- | staging-iMX53.xml | 2 | ||||
-rw-r--r-- | staging-iMX6.xml | 2 | ||||
-rw-r--r-- | staging-origen.xml | 2 | ||||
-rw-r--r-- | staging-panda.xml | 2 | ||||
-rw-r--r-- | staging-snowball.xml | 2 | ||||
-rw-r--r-- | staging-vexpress-a9.xml | 2 | ||||
-rw-r--r-- | tracking-panda.xml | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/default.xml b/default.xml index bfd8058..a8c9348 100644 --- a/default.xml +++ b/default.xml @@ -24,7 +24,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" /> <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" /> diff --git a/landing-panda.xml b/landing-panda.xml index 581b5d7..f334431 100644 --- a/landing-panda.xml +++ b/landing-panda.xml @@ -28,7 +28,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" /> <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" /> diff --git a/landing-snowball.xml b/landing-snowball.xml index 2a56d20..90819a9 100644 --- a/landing-snowball.xml +++ b/landing-snowball.xml @@ -28,7 +28,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="git/boot/u-boot-ux500" revision="master" remote="igloocommunity" /> <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" /> diff --git a/staging-iMX53.xml b/staging-iMX53.xml index ae71917..74c9e56 100644 --- a/staging-iMX53.xml +++ b/staging-iMX53.xml @@ -25,7 +25,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" /> <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" /> diff --git a/staging-iMX6.xml b/staging-iMX6.xml index e69135f..2a6e8bc 100644 --- a/staging-iMX6.xml +++ b/staging-iMX6.xml @@ -25,7 +25,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <!-- iMX6 needs a special u-boot for the time being... --> <!-- project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" / --> diff --git a/staging-origen.xml b/staging-origen.xml index db6dad9..9178f96 100644 --- a/staging-origen.xml +++ b/staging-origen.xml @@ -28,7 +28,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro_android_4.0.3" remote="linaro-android" /> <project path="u-boot" name="people/angus/u-boot" revision="origen" remote="linaro-other"/> diff --git a/staging-panda.xml b/staging-panda.xml index 4b2906c..f784497 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -24,7 +24,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" /> <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" /> diff --git a/staging-snowball.xml b/staging-snowball.xml index 2cd3739..f715457 100644 --- a/staging-snowball.xml +++ b/staging-snowball.xml @@ -28,7 +28,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="git/boot/u-boot-ux500" revision="master" remote="igloocommunity" /> <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" /> diff --git a/staging-vexpress-a9.xml b/staging-vexpress-a9.xml index 38c6cce..cb6b73b 100644 --- a/staging-vexpress-a9.xml +++ b/staging-vexpress-a9.xml @@ -26,7 +26,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="people/tixy/u-boot" revision="vexpress-hacks" remote="linaro-other" /> <project path="uefi" name="arm/uefi/uefi" revision="master" remote="linaro-other" /> diff --git a/tracking-panda.xml b/tracking-panda.xml index 1358380..195bd2c 100644 --- a/tracking-panda.xml +++ b/tracking-panda.xml @@ -24,7 +24,7 @@ <project path="external/busybox" name="platform/external/busybox" revision="linaro_android_4.0.3" /> <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" /> <project path="external/x264" name="platform/external/x264" revision="linaro-master" /> - <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.9" /> + <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.10" /> <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" /> <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" /> <project path="external/gator" name="arm/ds5/gator" revision="android" remote="linaro-other" /> |