Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05b3db9c authored by Koushik Dutta's avatar Koushik Dutta
Browse files

Merge branch 'gingerbread' of git://github.com/CyanogenMod/android into gingerbread

parents 3777a62b f6e8ac8f
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@
  <project path="external/dhcpcd" name="platform/external/dhcpcd" />
  <project path="external/dnsmasq" name="platform/external/dnsmasq" />
  <project path="external/dropbear" name="CyanogenMod/android_external_dropbear" revision="master" remote="github" />
  <project path="external/e2fsprogs" name="platform/external/e2fsprogs" />
  <project path="external/e2fsprogs" name="CyanogenMod/android_external_e2fsprogs" remote="github" />
  <project path="external/easymock" name="platform/external/easymock" />
  <project path="external/elfcopy" name="platform/external/elfcopy" />
  <project path="external/elfutils" name="platform/external/elfutils" />
@@ -126,8 +126,8 @@
  <project path="external/vim" name="CyanogenMod/android_external_vim" remote="github" revision="master" />
  <project path="external/webkit" name="CyanogenMod/android_external_webkit" remote="github" />
  <project path="external/wireless-tools" name="CyanogenMod/android_external_wireless-tools" remote="github" />
  <project path="external/wpa_supplicant" name="platform/external/wpa_supplicant" />
  <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
  <project path="external/wpa_supplicant" name="CyanogenMod/android_external_wpa_supplicant" remote="github" />
  <project path="external/wpa_supplicant_6" name="CyanogenMod/android_external_wpa_supplicant_6" remote="github" />
  <project path="external/xmlwriter" name="platform/external/xmlwriter" />
  <project path="external/yaffs2" name="CyanogenMod/android_external_yaffs2" remote="github" />
  <project path="external/zlib" name="platform/external/zlib" />
@@ -141,7 +141,7 @@
  <project path="hardware/msm7k" name="CyanogenMod/android_hardware_msm7k" remote="github" />
  <project path="hardware/qcom/gps" name="CyanogenMod/android_hardware_qcom_gps" remote="github" />
  <project path="hardware/qcom/media" name="CyanogenMod/android_hardware_qcom_media" remote="github" />
  <project path="hardware/ril" name="platform/hardware/ril" />
  <project path="hardware/ril" name="CyanogenMod/android_hardware_ril" remote="github" />
  <project path="hardware/ti/omap3" name="CyanogenMod/android_hardware_ti_omap3" remote="github" />
  <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
  <project path="libcore" name="platform/libcore" />
@@ -158,6 +158,7 @@
  <project path="packages/apps/CMParts" name="CyanogenMod/android_packages_apps_CMParts" remote="github" />
  <project path="packages/apps/CMStats" name="CyanogenMod/android_packages_apps_CMStats" remote="github" />
  <project path="packages/apps/CMUpdateNotify" name="CyanogenMod/android_packages_apps_CMUpdateNotify" remote="github" />
  <project path="packages/apps/CMWallpapers" name="CyanogenMod/android_packages_apps_CMWallpapers" remote="github" />
  <project path="packages/apps/Contacts" name="platform/packages/apps/Contacts" />
  <project path="packages/apps/DeskClock" name="CyanogenMod/android_packages_apps_DeskClock" remote="github" />
  <project path="packages/apps/Email" name="platform/packages/apps/Email" />