moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs

Browse Source
This commit is contained in:
Tim Bray 2014-11-19 14:37:06 -08:00
commit 629d83a1ce
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/AndroidManifest.xml
View File

@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain" package="org.sufficientlysecure.keychain"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="31200" android:versionCode="31201"
android:versionName="3.1.2"> android:versionName="3.2beta1">
<!-- <!--
General remarks General remarks

2
extern/KeybaseLib vendored

@ -1 +1 @@
Subproject commit 70c2f33e26d3988a23524935810bcfe754b85a6f Subproject commit 7f4980f0789d7bb3c2124080f32b3bec703c576e

2
extern/minidns vendored

@ -1 +1 @@
Subproject commit 9e42bff01440c1351946a432126d5a1b87fb7c78 Subproject commit 118fefcaaa44a7f31f5c18fa7e477f1665f654b6