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