diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-14 03:56:56 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-14 03:56:56 +0200 |
| commit | d885f145a0b8bd350be6b7d3abe308d1767b75aa (patch) | |
| tree | 11bd9fa227a70b5007ee54a93baed7f3ae7628c5 | |
| parent | f5b53b58f77b6613c47234c565bd497c32f41cdf (diff) | |
| download | open-keychain-d885f145a0b8bd350be6b7d3abe308d1767b75aa.tar.gz open-keychain-d885f145a0b8bd350be6b7d3abe308d1767b75aa.tar.bz2 open-keychain-d885f145a0b8bd350be6b7d3abe308d1767b75aa.zip | |
Version 2.1.1
| -rw-r--r-- | OpenPGP-Keychain-API-Demo/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | OpenPGP-Keychain/AndroidManifest.xml | 21 | ||||
| -rw-r--r-- | OpenPGP-Keychain/res/raw/help_changelog.html | 5 |
3 files changed, 25 insertions, 5 deletions
diff --git a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml index d95df65a3..ad4aaf5f6 100644 --- a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml +++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.sufficientlysecure.keychain.demo" - android:versionCode="1" - android:versionName="1.0" > + android:versionCode="2" + android:versionName="1.1" > <uses-sdk android:minSdkVersion="7" diff --git a/OpenPGP-Keychain/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml index f35215d83..9e474271c 100644 --- a/OpenPGP-Keychain/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -1,10 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de> Copyright (C) 2010 Thialfihar <thi@thialfihar.org> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> +<!-- + Copyright (C) 2012-2013 Dominik Schürmann <dominik@dominikschuermann.de> + Copyright (C) 2010 Thialfihar <thi@thialfihar.org> + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.sufficientlysecure.keychain" android:installLocation="auto" - android:versionCode="21000" - android:versionName="2.1" > + android:versionCode="21100" + android:versionName="2.1.1" > <!-- General remarks diff --git a/OpenPGP-Keychain/res/raw/help_changelog.html b/OpenPGP-Keychain/res/raw/help_changelog.html index 9286cb17d..a3e124577 100644 --- a/OpenPGP-Keychain/res/raw/help_changelog.html +++ b/OpenPGP-Keychain/res/raw/help_changelog.html @@ -5,6 +5,11 @@ And don't add newlines before or after p tags because of transifex --> <head> </head> <body> +<h2>2.1.1</h2> +<ul> +<li>API Updates, preparation for k9mail integration</li> +</ul> + <h2>2.1</h2> <ul> <li>Lots of bug fixes</li> |