diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-10 17:36:02 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-02-10 17:36:02 +0100 |
| commit | da6dfb57a0aa816919cd23752e1707ba6a2e8cae (patch) | |
| tree | d6ede03785491d4c56b10cad9062b8bcac3ea78b /.gitmodules | |
| parent | 01b165ea88a032f31b8c2ff07351d3f893f6413d (diff) | |
| parent | 751298a4d832f316244fd6345c46ba806dcfc860 (diff) | |
| download | open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.tar.gz open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.tar.bz2 open-keychain-da6dfb57a0aa816919cd23752e1707ba6a2e8cae.zip | |
Merge branch 'master' into performance
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index fc4c5f5e0..a3337f219 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "extern/spongycastle"] - path = extern/spongycastle - url = https://github.com/open-keychain/spongycastle.git - ignore = dirty [submodule "extern/openpgp-api-lib"] path = extern/openpgp-api-lib url = https://github.com/open-keychain/openpgp-api.git @@ -25,3 +21,8 @@ [submodule "OpenKeychain/src/test/resources/openpgp-interop"] path = OpenKeychain/src/test/resources/openpgp-interop url = https://github.com/google/openpgp-interop + ignore = dirty +[submodule "extern/bouncycastle"] + path = extern/bouncycastle + url = https://github.com/open-keychain/bouncycastle.git + ignore = dirty |