From 16250c29d33c4375c1bbb36b8a7b43fe7b08bf6a Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 27 Oct 2013 01:16:32 +0200 Subject: [PATCH] new branches --- scripts/mergeAll.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 281e2bfcf..b08961c91 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -13,6 +13,13 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich +git checkout plugins +git merge master + +git checkout plugins-ics +git merge plugins +git merge ice-cream-sandwich + git checkout yota git merge ice-cream-sandwich