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 /libs/openpgp-api-lib/project.properties | |
| 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 '')
| -rw-r--r-- | libs/openpgp-api-lib/project.properties (renamed from project.properties) | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/project.properties b/libs/openpgp-api-lib/project.properties index 7276fb94..91d2b024 100644 --- a/project.properties +++ b/libs/openpgp-api-lib/project.properties @@ -12,6 +12,4 @@ # Project target. target=android-19 -android.library.reference.1=libs/minidns -android.library.reference.2=libs/openpgp-api-lib -android.library.reference.3=libs/MemorizingTrustManager +android.library=true |