From a34f1f45771ecdfd2a1fc16a4594dee638736326 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Mon, 23 Sep 2013 22:36:28 +0100 Subject: [PATCH] version for android 1.5 has gone --- scripts/buildAll.sh | 7 ------- scripts/mergeAll.sh | 3 --- 2 files changed, 10 deletions(-) diff --git a/scripts/buildAll.sh b/scripts/buildAll.sh index 212060c35..a6dbbe7da 100755 --- a/scripts/buildAll.sh +++ b/scripts/buildAll.sh @@ -11,13 +11,6 @@ ant distclean mv bin/FBReaderJ.apk READY cp bin/proguard/mapping.txt mappings/mapping-`cat VERSION`.master.txt -git checkout android-1.5 -./scripts/packageTool.sh --updateVersion -ant clean -./buildSignedJar.sh -mv bin/FBReaderJ.apk READY/FBReaderJ_android1.5.apk -cp bin/proguard/mapping.txt mappings/mapping-`cat VERSION`.android-1.5.txt - git checkout ice-cream-sandwich ./scripts/packageTool.sh --updateVersion ant clean diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index fe66e011e..56c83ade5 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -1,8 +1,5 @@ #!/bin/sh -git checkout android-1.5 -git merge master - git checkout ice-cream-sandwich git merge master