Permalink
Browse files

VERSION => 1.5

  • Loading branch information...
1 parent b7a7661 commit 06209c77516b34b336040e9321d33b1ada1882e3 @geometer committed May 1, 2012
Showing with 2 additions and 9 deletions.
  1. +1 −1 AndroidManifest.xml
  2. +1 −1 VERSION
  3. +0 −7 scripts/mergeAll.sh
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="104061" android:versionName="1.4.6" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="105001" android:versionName="1.5" android:installLocation="auto">
<uses-sdk android:minSdkVersion="5" android:maxSdkVersion="10"/>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
<uses-permission android:name="android.permission.INTERNET"/>
View
@@ -1 +1 @@
-1.4.6
+1.5
View
@@ -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

0 comments on commit 06209c7

Please sign in to comment.