cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into yubikey

Browse Source 
Conflicts:
	.gitmodules
This commit is contained in:
Dominik Schürmann
2014-07-18 09:47:24 +02:00
parent 69c38c3f34 306bea5ee9
commit d8ada7c1bb
96 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@@ -31,9 +31,6 @@
[submodule "extern/minidns"]
path = extern/minidns
url = https://github.com/open-keychain/minidns.git
[submodule "OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell"]
path = OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
url = https://github.com/singpolyma/OpenPGP-Haskell.git
[submodule "extern/openpgp-card-nfc-lib"]
path = extern/openpgp-card-nfc-lib
url = https://github.com/open-keychain/openpgp-card-nfc-lib.git
url = https://github.com/open-keychain/openpgp-card-nfc-lib.git