summaryrefslogtreecommitdiff
authorHelio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk>2012-08-10 13:32:50 (GMT)
committer Helio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk>2012-08-10 13:32:50 (GMT)
commitd7170eaf271e790739ff99a741a018ab972c3575 (patch) (side-by-side diff)
tree02fa545106677b0c89cf15940cfd4d3d118a35ab
parent3fa22cdede32c5f9442c7764361ed112996d585a (diff)
downloadmanifest-d7170eaf271e790739ff99a741a018ab972c3575.tar.gz
manifest-d7170eaf271e790739ff99a741a018ab972c3575.tar.bz2
We are using master for Collabora work right now.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--default.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/default.xml b/default.xml
index ac9976a..79f7d01 100644
--- a/default.xml
+++ b/default.xml
@@ -4,17 +4,17 @@
<remote name="aosp" fetch="https://android.googlesource.com/" />
<remote name="ccu" fetch="git://git.collabora.co.uk/git/android/" />
<remote name="cyanogen" fetch="https://github.com/CyanogenMod/" />
- <default revision="refs/tags/android-4.0.4_r2.1"
- remote="ccu"
- sync-j="4" />
+ <default remote="ccu" sync-j="4" />
- <!-- Collabora custom entries -->
- <project path="external/collabora/config" name="platform/external/collabora/config" revision="master" />
+ <!-- Collabora own entries on defaults -->
+ <project path="external/collabora/config" name="platform/external/collabora/config" />
<project path="external/collabora/glib" name="platform/external/collabora/glib" />
<project path="external/collabora/libffi" name="platform/external/collabora/libffi" />
- <project path="external/mesa3d" name="platform/external/mesa3d" revision="master" />
- <project path="frameworks/base" name="platform/frameworks/base" revision="master" />
- <project path="external/androgenizer" name="androgenizer" revision="master" />
+
+ <!-- Collabora custom entries -->
+ <project path="external/mesa3d" name="platform/external/mesa3d" />
+ <project path="frameworks/base" name="platform/frameworks/base" />
+ <project path="external/androgenizer" name="androgenizer" />
<project path="system/core" name="platform/system/core" />
<!-- for 'adb shell' user's convenience, the cyanogen busybox port -->