From f68e57c042c59ce58c8eae2857b8a33ae96ca11f Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Fri, 25 Oct 2013 17:26:49 +0100 Subject: [PATCH] new actual branches --- scripts/mergeAll.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 56c83ade5..281e2bfcf 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -1,5 +1,8 @@ #!/bin/sh +git checkout new-book-events +git merge master + git checkout ice-cream-sandwich git merge master @@ -10,4 +13,7 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich +git checkout yota +git merge ice-cream-sandwich + git checkout master