diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-23 16:22:32 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-23 16:25:06 +0000 |
| commit | f0ca96308b23643df1208acfe72015b46ae70067 (patch) | |
| tree | 265bc747a3b5383075ecb12d99c3c89dcd5a2274 /app/src/main/AndroidManifest.xml | |
| parent | 89ee9588459755193dfff3df45f4494d53b25854 (diff) | |
| parent | f129a9b52110ffafec4400e17d78881c50307d8a (diff) | |
| download | connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.gz connectbot-f0ca96308b23643df1208acfe72015b46ae70067.tar.bz2 connectbot-f0ca96308b23643df1208acfe72015b46ae70067.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
app/src/main/java/org/connectbot/HostListActivity.java
app/src/main/java/org/connectbot/service/TerminalKeyListener.java
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 30b3ad0..5fbee63 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,8 +17,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.connectbot" - android:versionName="1.8.0" - android:versionCode="370" + android:versionName="1.8.2" + android:versionCode="372" android:installLocation="auto"> <uses-sdk android:targetSdkVersion="15" android:minSdkVersion="4" /> |