diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-06 16:17:01 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-06 16:17:01 +0200 |
commit | 4e378a0a332b0e8a41060daf59480c2dec0bc388 (patch) | |
tree | a5dd0129a4974d336eee50bcbd1bfc19a99883da /README.md | |
parent | a0b0eeaf878cb039b3e3f3837a7cce0e96907b80 (diff) | |
download | open-keychain-4e378a0a332b0e8a41060daf59480c2dec0bc388.tar.gz open-keychain-4e378a0a332b0e8a41060daf59480c2dec0bc388.tar.bz2 open-keychain-4e378a0a332b0e8a41060daf59480c2dec0bc388.zip |
Relicensing from Apache License v2 to GPLv3+. This is only done on classes that (have copyright by Dominik Schürmann or Markus Doits) or (are completly refactored by me and contain no remaining code by Thialfihar). Code by Thialfihar (not reachable by mail) and Shaun Senecal (disagreed on license change) remain Apache License v2.
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -87,7 +87,22 @@ See http://source.android.com/source/code-style.html See http://www.androidpolice.com/2009/11/04/auto-formatting-android-xml-files-with-eclipse/ # Licenses -OpenPGP Kechain is licensed under Apache License v2. +OpenPGP Kechain is licensed under GPLv3+. +Some parts (older parts and some libraries are Apache License v2, MIT X11 License) + +> This program is free software: you can redistribute it and/or modify +> it under the terms of the GNU General Public License as published by +> the Free Software Foundation, either version 3 of the License, or +> (at your option) any later version. +> +> This program is distributed in the hope that it will be useful, +> but WITHOUT ANY WARRANTY; without even the implied warranty of +> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +> GNU General Public License for more details. +> +> You should have received a copy of the GNU General Public License +> along with this program. If not, see <http://www.gnu.org/licenses/>. + ## Libraries * ActionBarSherlock |