eae7c711a3
Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
34 lines
1.4 KiB
Plaintext
34 lines
1.4 KiB
Plaintext
[submodule "extern/StickyListHeaders"]
|
|
path = extern/StickyListHeaders
|
|
url = https://github.com/open-keychain/StickyListHeaders.git
|
|
[submodule "extern/zxing-android-integration"]
|
|
path = extern/zxing-android-integration
|
|
url = https://github.com/open-keychain/zxing-android-integration.git
|
|
[submodule "extern/zxing-qr-code"]
|
|
path = extern/zxing-qr-code
|
|
url = https://github.com/open-keychain/zxing-qr-code.git
|
|
[submodule "extern/spongycastle"]
|
|
path = extern/spongycastle
|
|
url = https://github.com/open-keychain/spongycastle.git
|
|
[submodule "extern/html-textview"]
|
|
path = extern/html-textview
|
|
url = https://github.com/open-keychain/html-textview.git
|
|
[submodule "extern/openpgp-api-lib"]
|
|
path = extern/openpgp-api-lib
|
|
url = https://github.com/open-keychain/openpgp-api-lib.git
|
|
[submodule "extern/openkeychain-api-lib"]
|
|
path = extern/openkeychain-api-lib
|
|
url = https://github.com/open-keychain/openkeychain-api-lib.git
|
|
[submodule "extern/SuperToasts"]
|
|
path = extern/SuperToasts
|
|
url = https://github.com/open-keychain/SuperToasts.git
|
|
[submodule "extern/KeybaseLib"]
|
|
path = extern/KeybaseLib
|
|
url = https://github.com/open-keychain/KeybaseLib.git
|
|
[submodule "extern/minidns"]
|
|
path = extern/minidns
|
|
url = https://github.com/open-keychain/minidns.git
|
|
[submodule "extern/TokenAutoComplete"]
|
|
path = extern/TokenAutoComplete
|
|
url = https://github.com/open-keychain/TokenAutoComplete
|