summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-12-25 23:51:48 +0100
committerArne Schwabe <arne@rfc2549.org>2012-12-25 23:51:48 +0100
commit1bfb7e8c5d26dc5be0f594742ecc9ccdd958f1e2 (patch)
tree1e2260a9780fac0634336ad530c719a9c6e4a86f
parent3018f292ff635d7ec61b3cd02a1e13659819683f (diff)
parent442846f86eda8e0281d8137c55a77386b969eacb (diff)
Merge again
-rw-r--r--.hgtags2
-rw-r--r--AndroidManifest.xml7
2 files changed, 5 insertions, 4 deletions
diff --git a/.hgtags b/.hgtags
index 667ff575..57fcfa86 100644
--- a/.hgtags
+++ b/.hgtags
@@ -29,3 +29,5 @@ d356e8526528be9d800d83022aa8004c910fa407 v0.5.23
963a0716b027deaa7b00a5327165d3d130993aee v0.5.27
4b88cad1e252f6b1daf4a8dbb0ce8911604ba97a v0.5.27
9ff0a312799b05c56f59f729496ac5ea484a841b v0.5.28
+9ff0a312799b05c56f59f729496ac5ea484a841b v0.5.28
+2385ce9867e4f8f5943fcd1c29c91ec271abc9ba v0.5.28
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 084e382a..b3103ac0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,15 +17,14 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.blinkt.openvpn"
- android:versionCode="55"
- android:versionName="0.5.27" >
+ android:versionCode="56"
+ android:versionName="0.5.28" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.READ_LOGS" />
<!-- <uses-permission android:name="com.android.vending.BILLING" /> -->
@@ -127,4 +126,4 @@
android:grantUriPermissions="true" />
</application>
-</manifest> \ No newline at end of file
+</manifest>