diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 281e2bfcf..b08961c91 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -13,6 +13,13 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich +git checkout plugins +git merge master + +git checkout plugins-ics +git merge plugins +git merge ice-cream-sandwich + git checkout yota git merge ice-cream-sandwich