aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 23:03:45 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2013-01-08 23:03:45 +0100
commit3c48442399362e6e4fe6bf4eff4d628e58d50658 (patch)
treea8905db2f118e53ea717da8157b38b4f7825d099
parent152dddb5e9117d5960298b4a2f8a435e72b935a8 (diff)
downloadopen-keychain-3c48442399362e6e4fe6bf4eff4d628e58d50658.tar.gz
open-keychain-3c48442399362e6e4fe6bf4eff4d628e58d50658.tar.bz2
open-keychain-3c48442399362e6e4fe6bf4eff4d628e58d50658.zip
changelog
-rw-r--r--APG/res/raw/help_changelog.html7
-rw-r--r--CHANGELOG5
2 files changed, 7 insertions, 5 deletions
diff --git a/APG/res/raw/help_changelog.html b/APG/res/raw/help_changelog.html
index bf013342b..fa1201cc1 100644
--- a/APG/res/raw/help_changelog.html
+++ b/APG/res/raw/help_changelog.html
@@ -8,13 +8,14 @@ And don't add newlines before or after p tags because of transifex -->
<h2>2.0</h2>
<ul>
<li>Complete redesign</li>
-<li>Integration of different branches:</li>
-<li>Share public keys via qr codes</li>
+<li>Share public keys via qr codes, nfc beam</li>
<li>Sign keys</li>
<li>Upload keys to server</li>
+<li>Fixes import issues</li>
+<li>New AIDL API</li>
</ul>
-<h2><h2>1.08</h2>
+<h2>1.08</h2>
<ul>
<li>basic key server support</li>
<li>app2sd (untested, let me know if there are problems)</li>
diff --git a/CHANGELOG b/CHANGELOG
index f61800a5a..131decc69 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,10 @@
2.0
* Complete redesign
-* Integration of different branches:
-* Share public keys via qr codes
+* Share public keys via qr codes, nfc beam
* Sign keys
* Upload keys to server
+* Fixes import issues
+* New AIDL API
1.0.8
* basic key server support (HKP, please report bugs :))