diff --git a/CHANGES.md b/CHANGES.md index 733d6ab..f9aca98 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +v1.2.2 (2015-9-16) +----------- +* Hotfix: crypto initialization + + v1.2.1 (2015-9-12) ----------- * Change: update 3rd library to latest @@ -7,7 +12,7 @@ v1.2.1 (2015-9-12) v1.2.0 (2015-6-07) ----------- -* Change: json instead of realm for profile store +* Change: json instead of realm for profile store * Change: Remove libsuperuser diff --git a/app/build.gradle b/app/build.gradle index 9af8a48..a8fea31 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { minSdkVersion 18 targetSdkVersion 22 versionCode 120 - versionName '1.2.1' + versionName '1.2.2' } lintOptions { abortOnError true diff --git a/jni/xsocks b/jni/xsocks index 8b84f1c..89aac04 160000 --- a/jni/xsocks +++ b/jni/xsocks @@ -1 +1 @@ -Subproject commit 8b84f1c7a0c7d6f3b35b008ddf89b1a72e6957c8 +Subproject commit 89aac04feb3700cdd2109ee9e59e5a06b74fd91d