aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-06-24 20:16:46 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-06-24 20:16:46 +0200
commit9ce7d29a2d2769e9ee8d7838d60bbb19ce77907d (patch)
tree56dea21f9a088c26933089aa3d4f279295c0b01b /.gitmodules
parente84aa5a69d0d6f17699ed2af2bcb0561b31ac90d (diff)
parent109f74a922ec046ba6e8eb171942cbbda3db25ab (diff)
downloadopen-keychain-9ce7d29a2d2769e9ee8d7838d60bbb19ce77907d.tar.gz
open-keychain-9ce7d29a2d2769e9ee8d7838d60bbb19ce77907d.tar.bz2
open-keychain-9ce7d29a2d2769e9ee8d7838d60bbb19ce77907d.zip
Merge submodules
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index f18a8731b..a4416730d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
[submodule "extern/minidns"]
path = extern/minidns
url = https://github.com/open-keychain/minidns.git
+[submodule "OpenKeychain/src/test/resources/extern/OpenPGP-Haskell"]
+ path = OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
+ url = https://github.com/singpolyma/OpenPGP-Haskell.git