summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2015-04-01 10:50:26 (GMT)
committerKevin Smith <git@kismith.co.uk>2015-04-01 10:50:26 (GMT)
commitc812879b371f6f1cf268ca4cd48413ec38063527 (patch)
tree1d4d6efc86305a495baa1b6b6e07e488d3deb3b6 /COPYING
parentd62c9ba2dad0d9833c76452b5aa780a215548a5e (diff)
downloadstroke-c812879b371f6f1cf268ca4cd48413ec38063527.zip
stroke-c812879b371f6f1cf268ca4cd48413ec38063527.tar.bz2
Update copyright in light of recent contributions
Change-Id: I9f1ec4a20f154012579138104c1bebccdcbc228d
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING23
1 files changed, 21 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 8a9fb95..8fb26b4 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,5 @@
Stroke - An XMPP Library
-Copyright (C) 2010-2011 Kevin Smith, Remko Tronçon and Isode Limited, London, England
+Copyright (C) 2009-2015 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
@@ -728,4 +728,23 @@ Stroke also includes code with the following license:
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
---- END OF BASE64BSD LICENSE \ No newline at end of file
+--- END OF BASE64BSD LICENSE
+
+============
+Contributors
+============
+
+These projects contain some code contributed under the BSD License, under the following terms:
+
+--- START OF SIMPLIFIED BSD LICENSE
+Copyright (c) 2015 Tarun Gupta
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WA RRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--- END OF SIMPLIFIED BSD LICENSE