diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 877f67b4c..d56653359 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/VERSION b/VERSION index c514bd85c..c239c60cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.6 +1.5 diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index f6354458b..302de61a0 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -23,13 +23,6 @@ git merge booksdb git checkout library-service-ics git merge booksdb-ics -git checkout epub-native -git merge master - -git checkout epub-native-ics -git merge ice-cream-sandwich -git merge epub-native - git checkout multidirs git merge master