From d8fbb9a2eb1c0734e9b3610fa0beb817a795e8d6 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 10 Feb 2013 21:03:20 +0400 Subject: [PATCH] multidirs branch has gone --- scripts/mergeAll.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 7403bd4e0..506dfa5cb 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -6,11 +6,8 @@ git merge master git checkout ice-cream-sandwich git merge master -git checkout multidirs -git merge master - git checkout beta -git merge multidirs +git merge master git checkout beta-ics git merge beta