summaryrefslogtreecommitdiff
path: root/staging-origen.xml
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-02-17 09:32:24 +0059
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-02-17 09:32:24 +0059
commitdca56bfaec558069cd8efe7b1c1c8286c2560807 (patch)
tree50eaad28fe2a0a03ff35b1b567c3d90caf82aa1b /staging-origen.xml
parentc9492e8caa58ef7b3f2b09d5307aa0267e941da4 (diff)
parent707ad469b97aebf83485f5f7df9ff4a5387f82b2 (diff)
Merge branch 'linaro_android_4.0.3' of git://android.git.linaro.org/platform/manifest into linaro_android_4.0.3
Diffstat (limited to 'staging-origen.xml')
-rw-r--r--staging-origen.xml2
1 files changed, 1 insertions, 1 deletions
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"/>