aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-05-18 11:24:31 +0300
committerDominik Schürmann <dominik@dominikschuermann.de>2016-05-18 11:24:31 +0300
commit8847a2e770962b425e9c57b75fb42af1ad4c3219 (patch)
tree332bfcf643dd4e183ba1edd1e1fd672b50757fe1 /OpenKeychain/src/main
parente292ec0d1a53b48a8acc88de4315512783720e99 (diff)
downloadopen-keychain-8847a2e770962b425e9c57b75fb42af1ad4c3219.tar.gz
open-keychain-8847a2e770962b425e9c57b75fb42af1ad4c3219.tar.bz2
open-keychain-8847a2e770962b425e9c57b75fb42af1ad4c3219.zip
Changelog, contributors
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/res/raw/help_about.md5
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.md5
2 files changed, 10 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/raw/help_about.md b/OpenKeychain/src/main/res/raw/help_about.md
index a28dd7012..28fce6335 100644
--- a/OpenKeychain/src/main/res/raw/help_about.md
+++ b/OpenKeychain/src/main/res/raw/help_about.md
@@ -16,10 +16,13 @@ License: GPLv3+
* Adithya Abraham Philip
* Ash Hughes
* 'mar-v-in'
+ * Nikita Mikhailov
* 'Thialfihar' (APG developer)
* Tim Bray
## Occasional Contributors
+ * Alex Fong Jie Wen
+ * Andrea Torlaschi
* Art O Cathain
* Brian C. Barnes
* Bahtiar 'kalkin' Gadimov
@@ -42,10 +45,12 @@ License: GPLv3+
* Lukas Zorich
* Manoj Khanna
* Markus Doits
+ * Michal Kepkowski
* Miroojin Bakshi
* Morgan Gangwere
* Nikhil Peter Raj
* Paul Sarbinowski
+ * Petter Arvidsson
* 'Senecaso'
* Signe Rüsch
* Sreeram Boyapati
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.md b/OpenKeychain/src/main/res/raw/help_changelog.md
index 5babf658a..e9671c349 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.md
+++ b/OpenKeychain/src/main/res/raw/help_changelog.md
@@ -1,5 +1,10 @@
[//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!)
+## 4.0
+
+ * Experimental support for Security Tokens over USB
+ * Allow password changing of stripped keys
+
## 3.9
* Detection and handling of text data