From b4ae23b32599a545911d41723aa715d187d406d4 Mon Sep 17 00:00:00 2001
From: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Date: Sat, 16 Jan 2016 13:30:03 +0100
Subject: [PATCH] toolchain branches are now merged in main branch

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
---
 default.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/default.xml b/default.xml
index 1c331d6..78a10b0 100644
--- a/default.xml
+++ b/default.xml
@@ -25,7 +25,7 @@
            sync-j="4" />
 
 <!-- BEGIN CYANOGENMOD -->
-  <project path="build" name="replicant_build.git" remote="fossencdi" revision="replicant-6.0-toolchain" groups="pdk" >
+  <project path="build" name="replicant_build.git" remote="fossencdi" revision="replicant-6.0" groups="pdk" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
   <project path="android" name="CyanogenMod/android" />
@@ -310,7 +310,7 @@
   <project path="system/qcom" name="CyanogenMod/android_system_qcom" groups="qcom" />
   <project path="system/security" name="CyanogenMod/android_system_security" groups="pdk" />
   <project path="system/vold" name="CyanogenMod/android_system_vold" groups="pdk" />
-  <project path="vendor/replicant" name="vendor_replicant.git" remote="fossencdi" revision="replicant-6.0-toolchain" />
+  <project path="vendor/replicant" name="vendor_replicant.git" remote="fossencdi" revision="replicant-6.0" />
   <project path="vendor/cmsdk" name="CyanogenMod/cm_platform_sdk" />
   <project path="vendor/qcom/opensource/dataservices" name="CyanogenMod/android_vendor_qcom_opensource_dataservices" />
   <project path="vendor/qcom/opensource/dpm" name="CyanogenMod/android_vendor_qcom_opensource_dpm" />