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 | a142f5a6ebeeaa6b4f8e8ac559b3ea08d0677bf1 (patch) | |
tree | a36907b4ff206527720d4a414a021e4f5211461f /AndroidManifest.xml | |
parent | 6a4ba5d3976f6d219400a46c634dd479bc5981a5 (diff) | |
parent | 6ae2a24edf3255f998ffee8cd6d79e25557f5572 (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" > |