diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
| commit | eac4bf7d902dc2579983daa29bcb74ca14790de6 (patch) | |
| tree | 1139702220deb293c2f68d712280ff81e5b23f7c /libs | |
| parent | 92864c6696cf776de356f5e9bbe403a691c8746d (diff) | |
| parent | 4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff) | |
Merged 1.5.2 into trz/master with conflicts resolved
Diffstat (limited to '')
| -rw-r--r-- | libs/MemorizingTrustManager/build.gradle | 2 | ||||
| -rw-r--r-- | libs/openpgp-api-lib/build.gradle | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index aa022a93..47491fec 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:1.2.3' } } diff --git a/libs/openpgp-api-lib/build.gradle b/libs/openpgp-api-lib/build.gradle index 6e8fdfb5..a991cf26 100644 --- a/libs/openpgp-api-lib/build.gradle +++ b/libs/openpgp-api-lib/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.12.2' + classpath 'com.android.tools.build:gradle:1.2.3' } } |