summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-07-19 19:21:23 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-07-19 19:21:23 +0000
commitf6eca1ddf82e2ae81acb077d2bb33d88695f906b (patch)
tree718323fd0ad46be008a25a7e02bce2b133648dd5
parent49e977feb158bfb8190dfde70b26fb5e02bceb92 (diff)
parentaa874f5befbdcd3ef9cad9e29ee7abb27fa446ba (diff)
downloadpackages-f6eca1ddf82e2ae81acb077d2bb33d88695f906b.tar.gz
packages-f6eca1ddf82e2ae81acb077d2bb33d88695f906b.tar.bz2
packages-f6eca1ddf82e2ae81acb077d2bb33d88695f906b.tar.xz
packages-f6eca1ddf82e2ae81acb077d2bb33d88695f906b.zip
Merge branch 'it-is-now-2020' into 'master'
Update copyright info for 2020 See merge request adelie/packages!486
-rw-r--r--CONTRIBUTING.rst2
-rw-r--r--LICENSE9
-rw-r--r--README.rst2
3 files changed, 7 insertions, 6 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 642f2a4f8..360f6d1d0 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -6,7 +6,7 @@
:Status:
Draft
:Copyright:
- © 2017-2018 Adélie Linux Team. NCSA open source licence.
+ © 2017-2020 Adélie Linux Team. NCSA open source licence.
diff --git a/LICENSE b/LICENSE
index 67f0b1517..22239bee5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2017 Adélie Linux Team and Contributors.
+Copyright (c) 2016-2020 Adélie Linux Team and Contributors.
All rights reserved.
Developed by: Adélie Linux Team
@@ -19,9 +19,10 @@ Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimers in
the documentation and/or other materials provided with the distribution.
-Neither the names of Adélie Linux, Wilcox Technologies, LLC, nor the
-names of its contributors may be used to endorse or promote products
-derived from this Software without specific prior written permission.
+Neither the names of Adélie Linux; Wilcox Technologies, LLC;
+Adélie Software in the Public Benefit, LLC; nor the names of its
+contributors may be used to endorse or promote products derived
+from this Software without specific prior written permission.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
diff --git a/README.rst b/README.rst
index f5677945c..4bbad760c 100644
--- a/README.rst
+++ b/README.rst
@@ -10,7 +10,7 @@
:Status:
Production
:Copyright:
- © 2017-2019 Adélie Linux Team. NCSA open source licence.
+ © 2017-2020 Adélie Linux Team. NCSA open source licence.