Merge pull request #87 from dschuermann/development

Use git submodule with openpgp-api-lib only
This commit is contained in:
Daniel Gultsch 2014-05-07 20:06:12 +02:00
commit f4330b3a48
4 changed files with 5 additions and 5 deletions

6
.gitmodules vendored
View File

@ -1,7 +1,7 @@
[submodule "libs/openpgp-keychain"]
path = libs/openpgp-keychain
url = https://github.com/openpgp-keychain/openpgp-keychain.git
[submodule "libs/minidns"] [submodule "libs/minidns"]
path = libs/minidns path = libs/minidns
url = https://github.com/rtreffer/minidns.git 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

1
libs/openpgp-api-lib Submodule

@ -0,0 +1 @@
Subproject commit 650e1ebda82596cd4fbfaae406e6eccf189f4f63

@ -1 +0,0 @@
Subproject commit e0a0bf04ee6fa4794a82b44dae905bc814d85491

View File

@ -13,4 +13,4 @@
# Project target. # Project target.
target=android-19 target=android-19
android.library.reference.1=libs/minidns android.library.reference.1=libs/minidns
android.library.reference.2=libs/openpgp-keychain/OpenKeychain-API/libraries/openpgp-api-library android.library.reference.2=libs/openpgp-api-lib