From e4b0b64ffac749abce220176bb6a31b2b943f43b Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 19 Jan 2013 22:00:44 +0400 Subject: [PATCH] merge order --- scripts/mergeAll.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index f706d5862..a056a69c2 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -13,8 +13,8 @@ git checkout beta git merge multidirs git checkout beta-ics -git merge beta git merge ice-cream-sandwich +git merge beta git checkout library-service git merge master