aboutsummaryrefslogtreecommitdiffstats
path: root/README.mkdn
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-17 18:24:03 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-17 18:24:03 +0100
commit71a01dce178fb399e914fae82c0c9a9a8de1b120 (patch)
treee2cb063c06b82bfe22d6f48eb6f8ce2613076237 /README.mkdn
parentd02579012ac823fdbd7b8e185d65c54aef0eea1f (diff)
parent7f67b4e9402a566b85951a3b21049592e4c070ef (diff)
downloadvendor_replicant-71a01dce178fb399e914fae82c0c9a9a8de1b120.tar.gz
vendor_replicant-71a01dce178fb399e914fae82c0c9a9a8de1b120.tar.bz2
vendor_replicant-71a01dce178fb399e914fae82c0c9a9a8de1b120.zip
Merge remote-tracking branch 'github/cm-13.0' into replicant-6.0
remove prebuilt terminal (built-in terminal app can be activated in dev settings) Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> Conflicts: CHANGELOG.mkdn CONTRIBUTORS.mkdn config/cdma.mk config/cm_audio.mk config/common.mk config/common_full.mk config/common_full_phone.mk config/gsm.mk config/themes_common.mk get-prebuilts overlay/common/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.jpg overlay/common/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.jpg overlay/common/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.jpg overlay/common/frameworks/base/core/res/res/drawable-xhdpi/default_wallpaper.jpg overlay/common/frameworks/base/core/res/res/values/config.xml overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml prebuilt/common/bootanimation/1080.zip prebuilt/common/bootanimation/1200.zip prebuilt/common/bootanimation/240.zip prebuilt/common/bootanimation/320.zip prebuilt/common/bootanimation/360.zip prebuilt/common/bootanimation/480.zip prebuilt/common/bootanimation/540.zip prebuilt/common/bootanimation/600.zip prebuilt/common/bootanimation/720.zip prebuilt/common/bootanimation/768.zip prebuilt/common/bootanimation/800.zip prebuilt/common/etc/apns-conf.xml sepolicy/mac_permissions.xml sepolicy/sepolicy.mk vendorsetup.sh Change-Id: I4fc2a5b00721cae8b3a36f33c36f006142bad44f
Diffstat (limited to 'README.mkdn')
-rw-r--r--README.mkdn4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.mkdn b/README.mkdn
index a8e02d68..9eff1ec1 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -32,7 +32,7 @@ You can do this by using these commands:
(Go to repo you are patching, make your changes and commit)
cmgerrit <for(new)/changes(patch set)> <branch/change-id>
- repo start cm-10.1 .
+ repo start cm-13.0 .
(Make your changes and commit)
repo upload .
Note: "." meaning current directory
@@ -52,7 +52,7 @@ familiar with [Repo](https://source.android.com/source/using-repo.html) and [Ver
To initialize your local repository using the CyanogenMod trees, use a command like this:
- repo init -u git://github.com/CyanogenMod/android.git -b cm-10.1
+ repo init -u git://github.com/CyanogenMod/android.git -b cm-13.0
Then to sync up: