diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 3dc5162dd..bac8f4f58 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -26,6 +26,10 @@ git merge booksdb-ics git checkout epub-native git merge master +git checkout epub-native-ics +git merge epub-native +git merge ice-cream-sandwich + git checkout multidirs git merge master