summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2009-08-14 14:28:31 +0200
committerArwed von Merkatz2009-08-17 19:38:35 +0200
commit07172acfe17ff13ab5598c47a2f26c5592efc10a (patch)
tree4f74f85d0fe0aa14a24e693badf26e06a1d70ada
parent398e979c5c8f046e13c13a73e68bbf9db0d00df6 (diff)
gpgme: set default GPGME_BRANCH to 1.2 [Bug 15326]
(cherry picked from commit 88d98b06ea78b0009e063fb9b703ff35270fbc4b)
-rwxr-xr-xcrypto/gpgme/DETAILS2
-rw-r--r--crypto/gpgme/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/crypto/gpgme/DETAILS b/crypto/gpgme/DETAILS
index f4a714056e..3446fbe22c 100755
--- a/crypto/gpgme/DETAILS
+++ b/crypto/gpgme/DETAILS
@@ -15,7 +15,7 @@ fi
###
if [[ -z "$GPGME_BRANCH" ]] || [[ $GPGME_BRANCH == DEFAULT ]]; then
- GPGME_BRANCH="1.1"
+ GPGME_BRANCH="1.2"
fi
case $GPGME_BRANCH in
diff --git a/crypto/gpgme/HISTORY b/crypto/gpgme/HISTORY
index 77f4bb0380..e5066af993 100644
--- a/crypto/gpgme/HISTORY
+++ b/crypto/gpgme/HISTORY
@@ -1,3 +1,6 @@
+2009-08-14 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: set default GPGME_BRANCH to 1.2 [Bug 15326]
+
2009-06-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, PREPARE: added 1.2 branch, version 1.2.0