diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 91bb99dc6..8e31fecf5 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -1,5 +1,11 @@ #!/bin/sh +git checkout tags-master +git merge master + +git checkout cover_transfer_and_saving +git merge master + git checkout ice-cream-sandwich git merge master