From d7af2c58d593949f995614b134f8e221facae09a Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Mon, 7 Apr 2014 01:33:15 +0100 Subject: [PATCH] added filechooser branch --- scripts/mergeAll.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 91bb99dc6..79b0cdace 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -25,6 +25,9 @@ git merge master git checkout microtypography git merge ice-cream-sandwich +git checkout filechooser +git merge ice-cream-sandwich + git checkout yotabeta git merge beta-ics git merge yota2