From e3a23d22a94486356c8f76f4559cf0cded88eedc Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sat, 5 Oct 2013 13:57:25 +0100 Subject: [PATCH] actual branches --- scripts/mergeAll.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 29a88e707..6636fe1fd 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -10,13 +10,13 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich -git checkout catalogs-ics +git checkout ics-catalogs git merge ice-cream-sandwich -git checkout catalogs-ics-reorder -git merge catalogs-ics +git checkout ics-catalogs-reorder +git merge ics-catalogs -git checkout postion-2 +git checkout position-2 git merge master git checkout master