summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-02-05 16:39:04 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-02-09 08:58:50 (GMT)
commit5b33a37d7a46b4c8a33061f7871a919a5d4ae7db (patch)
tree7585703f5df92dad848d3770d7591cdae4be2273
parent915c0875428e73e9e41a5da05f9d80671da9533c (diff)
downloadswift-5b33a37d7a46b4c8a33061f7871a919a5d4ae7db.zip
swift-5b33a37d7a46b4c8a33061f7871a919a5d4ae7db.tar.bz2
Update copyright in COPYING and COPYING.gpl to 2016swift-3.0rc2
Test-Information: Verified that the license in the about window shows 2016 as copyright year. Change-Id: I648cd3ecf818a22af3e535701f15f8e0ac166320
-rw-r--r--COPYING2
-rw-r--r--COPYING.gpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 0be9237..6e23714 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
Swift - An XMPP Client
-Copyright (C) 2009-2014 Isode Limited.
+Copyright (C) 2009-2016 Isode Limited.
The license under which these products are made available is provided in the COPYING.gpl file.
These products also use third-party code and contributions, the licenses for which are provided in the COPYING.thirdparty file.
diff --git a/COPYING.gpl b/COPYING.gpl
index ba0efdc..287498c 100644
--- a/COPYING.gpl
+++ b/COPYING.gpl
@@ -1,32 +1,32 @@
Swift - An XMPP Client
-Copyright (C) 2009-2015 Isode Limited.
+Copyright (C) 2009-2016 Isode Limited.
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, version 3 of the License.
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/>.
Additional permission under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or combining
it with the OpenSSL library (or a modified version of that library),
containing parts covered by the terms of the OpenSSL License, the
licensors of this Program grant you additional permission to convey
the resulting work.
--- Start OF GNU GENERAL PUBLIC LICENSE ---
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.