diff options
| author | Sam Whited <sam@samwhited.com> | 2014-10-30 15:20:20 -0400 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2014-10-30 15:33:13 -0400 |
| commit | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /.gitmodules | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | a362bd10214b16f8939c12a1dd4376667fe0d49f (diff) | |
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 7ddaefe6..00000000 --- a/.gitmodules +++ /dev/null @@ -1,10 +0,0 @@ -[submodule "libs/minidns"] - path = libs/minidns - url = https://github.com/rtreffer/minidns.git - -[submodule "libs/openpgp-api-lib"] - path = libs/openpgp-api-lib - url = https://github.com/open-keychain/openpgp-api-lib.git -[submodule "libs/MemorizingTrustManager"] - path = libs/MemorizingTrustManager - url = https://github.com/iNPUTmice/MemorizingTrustManager.git |