From ec96ce8dd837f495fbeafef8592001e06b601bb0 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Mon, 14 Apr 2014 04:29:38 +0100 Subject: [PATCH] new branches --- scripts/mergeAll.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 79b0cdace..f4548690c 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -25,8 +25,12 @@ git merge master git checkout microtypography git merge ice-cream-sandwich -git checkout filechooser +git checkout fc +git merge master + +git checkout fc-ics git merge ice-cream-sandwich +git merge fc git checkout yotabeta git merge beta-ics