From ab62fd0a84d5e6d96f51c96b611e393ac9d047b7 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 22 Aug 2015 15:08:24 +0100 Subject: [PATCH] 2.6-kindle branch --- scripts/mergeAll.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index c9d744ed4..beb15faaf 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -31,4 +31,8 @@ git checkout 2.6 git merge 2.6ics git merge yota2 +git checkout 2.6-kindle +git merge 2.6 +git merge kindle + git checkout master