diff options
author | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:29:08 +0200 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-02 17:29:08 +0200 |
commit | b42eacfa8da0a642d629714f188cc0fc4c7e601a (patch) | |
tree | c57cb03a635528e00ae29a304c28266a4855bd3a /AndroidManifest.xml | |
parent | ace5e90b3dbc33f0fc34ac2f3dc40d3c990a6a11 (diff) | |
parent | d9608521bf431a648999d06581404fef4ff57ce0 (diff) |
Merge
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3a2b458e..e601f11e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.blinkt.openvpn" - android:versionCode="31" - android:versionName="0.5.9" > + android:versionCode="33" + android:versionName="0.5.9b" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> @@ -53,6 +53,7 @@ </intent-filter> </service> + <activity android:name=".ConfigConverter" android:label="Convert Config File" > @@ -92,7 +93,7 @@ android:pathPattern=".*\\.ovpn" android:scheme="file" /> </intent-filter> - </activity> + </activity> <activity android:name=".LaunchVPN" android:label="@string/vpn_launch_title" > |