summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-01-30 13:14:32 +0100
committerParménides GV <parmegv@sdf.org>2015-01-30 13:14:32 +0100
commit1a4643dc08a86dcd9650afa2255945df14445f2d (patch)
tree1183fb8073a241a147fcf84d0a2a6215e8954a61
parent1be9cbb303507a32b3d0c0345ef63e33dd126326 (diff)
parent618792ca47208818b892257da7d55809ed8ae20f (diff)
Merge branch 'release-0.9.2' into develop0.9.2RC1
-rw-r--r--CHANGELOG6
-rw-r--r--app/src/main/AndroidManifest.xml4
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 702bfd8f..d879089d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+0.9.2
+Bugs:
+- Sign Up dialog works correctly
+Features:
+- Updated ics-openvpn code (thanks Arne!)
+
0.9.1 January 21 2015 - the "insistent reloaded" release
Bugs:
- Autostart on boot works
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33c3eaba..7ee4ebbe 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="112"
- android:versionName="0.9.1" >
+ android:versionCode="113"
+ android:versionName="0.9.2RC1" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />