summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-04-28 12:00:02 +0200
committerParménides GV <parmegv@sdf.org>2014-04-28 12:00:02 +0200
commitd4caf8f35fc9dd43d370439e8f6b6727909b15b9 (patch)
tree47751f7773abe880beaeea939b0b5825f351124e
parente9fdf500fb3d8451c1feda27d9d97cbd41505a4e (diff)
parent03f64e60e0afed08406626875639a34f6aabadbb (diff)
Merge branch 'release-0.5.1' into develop
-rw-r--r--CHANGELOG8
-rw-r--r--app/src/main/AndroidManifest.xml4
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f6ffdc0e..d1f82e4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+0.5.1 April 26 2014 - the "blue sky" release
+Features
+- Autostart
+- Gradle build system
+Bugs Fixed
+- README file describes the building process correctly
+- Provider data is downloaded only using its commercial certificate
+
0.5 April 4 2014 - the "soft winds" release
Features
- Replace bitmask.net with demo.bitmask.net
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d23b069..0c6d0b3f 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="se.leap.bitmaskclient"
- android:versionCode="74"
- android:versionName="0.5" >
+ android:versionCode="77"
+ android:versionName="0.5.1" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />