diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-08-09 21:13:48 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-08-09 21:13:48 -0700 |
| commit | fd173ae94bb896d1d0793a4284a205c12c86dd30 (patch) | |
| tree | ae4c77137ade90f4b2688fb64e9f26506d684602 | |
| parent | a49a3376754ebb2f7bef4a90ed957472c2e552ac (diff) | |
| parent | 28b2b02bb09f236fa05394915a655c748c7e69c6 (diff) | |
| download | manifest-fd173ae94bb896d1d0793a4284a205c12c86dd30.tar.gz manifest-fd173ae94bb896d1d0793a4284a205c12c86dd30.tar.bz2 manifest-fd173ae94bb896d1d0793a4284a205c12c86dd30.zip | |
Merge branch 'ics' of git://github.com/CyanogenMod/android into HEAD
Conflicts:
default.xml
Change-Id: Ib307cc946bf13bab9d951d4d4930f7b8fd8bed56
| -rw-r--r-- | README.mkdn | 2 | ||||
| -rw-r--r-- | default.xml | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/README.mkdn b/README.mkdn index fcb5c99..3563909 100644 --- a/README.mkdn +++ b/README.mkdn @@ -47,4 +47,4 @@ Buildbot All supported devices are built nightly and periodically as changes are committed to ensure the source trees remain buildable. -You can view the current build statuses at [buildbot.teamdouche.net](http://buildbot.teamdouche.net/) +You can view the current build statuses at [CyanogenMod Jenkins](http://jenkins.cyanogenmod.com/) diff --git a/default.xml b/default.xml index cff660c..9b8c3c9 100644 --- a/default.xml +++ b/default.xml @@ -8,6 +8,9 @@ fetch=".." review="review.cyanogenmod.com" /> + <remote name="private" + fetch="ssh://git@github.com" /> + <default revision="refs/heads/ics-release" remote="github" sync-j="4" /> @@ -168,6 +171,7 @@ <project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" remote="aosp" revision="refs/tags/android-4.0.4_r2.1" /> <project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" remote="aosp" revision="refs/tags/android-4.0.4_r2.1" /> <project path="frameworks/support" name="platform/frameworks/support" remote="aosp" revision="refs/tags/android-4.0.4_r2.1" /> + <project path="hardware/alsa_sound" name="CyanogenMod/android_hardware_alsa_sound" /> <project path="hardware/atheros/wlan" name="CyanogenMod/android_hardware_atheros_wlan" /> <project path="hardware/broadcom/wlan" name="CyanogenMod/android_hardware_broadcom_wlan" /> <project path="hardware/cm" name="CyanogenMod/android_hardware_cm" /> @@ -199,7 +203,7 @@ <project path="packages/apps/DeskClock" name="CyanogenMod/android_packages_apps_DeskClock" /> <project path="packages/apps/DSPManager" name="CyanogenMod/android_packages_apps_DSPManager" /> <project path="packages/apps/Email" name="CyanogenMod/android_packages_apps_Email" /> - <project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" remote="aosp" revision="refs/tags/android-4.0.4_r2.1" /> + <project path="packages/apps/Exchange" name="CyanogenMod/android_packages_apps_Exchange" /> <project path="packages/apps/Gallery" name="CyanogenMod/android_packages_apps_Gallery" /> <project path="packages/apps/Gallery2" name="platform/packages/apps/Gallery2" remote="aosp" revision="refs/tags/android-4.0.4_r2.1" /> <project path="packages/apps/GanOptimizer" name="CyanogenMod/android_packages_apps_GanOptimizer" /> @@ -249,6 +253,7 @@ <project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" remote="aosp" revision="refs/tags/android-4.0.4_r2.1" /> <project path="prebuilt" name="CyanogenMod/android_prebuilt" /> <project path="vendor/cm" name="CyanogenMod/android_vendor_cm" /> + <project path="vendor/qcom/opensource/kernel-tests/mm-audio" name="CyanogenMod/android_vendor_qcom_opensource_kernel-tests_mm-audio" /> <project path="vendor/qcom/opensource/omx/mm-audio" name="CyanogenMod/android_vendor_qcom_opensource_omx_mm-audio" /> <project path="vendor/qcom/opensource/omx/mm-core" name="CyanogenMod/android_vendor_qcom_opensource_omx_mm-core" /> <project path="vendor/qcom/opensource/omx/mm-video" name="CyanogenMod/android_vendor_qcom_opensource_omx_mm-video" /> |