summaryrefslogtreecommitdiff
path: root/keymanager
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-15 10:04:03 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-15 10:04:03 -0300
commit04274cc916007fec5745a4aee834d6a56a1da134 (patch)
treebc3f3a5d83385766f1158e402e09befe20625b8d /keymanager
parent692f1f8e9d33b50bc00bdebea8874f9126be5b49 (diff)
Fold in changes
Diffstat (limited to 'keymanager')
-rw-r--r--keymanager/CHANGELOG8
-rw-r--r--keymanager/changes/bug-4427_default-encoding-to-utf82
-rw-r--r--keymanager/changes/feature-4375_add-verification-of-detached-sigs1
-rw-r--r--keymanager/changes/feature-expose-methods2
4 files changed, 8 insertions, 5 deletions
diff --git a/keymanager/CHANGELOG b/keymanager/CHANGELOG
index dc89742c..e20b86c8 100644
--- a/keymanager/CHANGELOG
+++ b/keymanager/CHANGELOG
@@ -1,3 +1,11 @@
+0.3.6 Nov 15:
+ o Default encoding to 'utf-8' in case of system encodings not
+ set. Closes #4427.
+ o Add verification of detached signatures. Closes #4375.
+ o New openpgp method: parse_ascii_keys.
+ o Expose openpgp methods in keymanager (parse_ascii_keys, put_key,
+ delete_key).
+
0.3.5 Nov 1:
o Return unicode decrypted text to avoid encoding issues. Related to
#4000.
diff --git a/keymanager/changes/bug-4427_default-encoding-to-utf8 b/keymanager/changes/bug-4427_default-encoding-to-utf8
deleted file mode 100644
index 3f7d6713..00000000
--- a/keymanager/changes/bug-4427_default-encoding-to-utf8
+++ /dev/null
@@ -1,2 +0,0 @@
- o Default encoding to 'utf-8' in case of system encodings not set. Closes
- #4427.
diff --git a/keymanager/changes/feature-4375_add-verification-of-detached-sigs b/keymanager/changes/feature-4375_add-verification-of-detached-sigs
deleted file mode 100644
index ee09cbee..00000000
--- a/keymanager/changes/feature-4375_add-verification-of-detached-sigs
+++ /dev/null
@@ -1 +0,0 @@
- o Add verification of detached signatures. Closes #4375.
diff --git a/keymanager/changes/feature-expose-methods b/keymanager/changes/feature-expose-methods
deleted file mode 100644
index 92b30d5c..00000000
--- a/keymanager/changes/feature-expose-methods
+++ /dev/null
@@ -1,2 +0,0 @@
- o New openpgp method: parse_ascii_keys.
- o Expose openpgp methods in keymanager (parse_ascii_keys, put_key, delete_key).