summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorLaslo Hunhold <dev@frign.de>2017-08-02 21:46:54 +0200
committerLaslo Hunhold <dev@frign.de>2017-08-02 21:46:54 +0200
commit9e0a561d7453d4f92051496314e4edcc06a97ae5 (patch)
tree8305a16f3d57346e070320d3e838be21473c29bc /LICENSE
parentf0f85f1a0cfcd6d501aee848238913a4fd1e0606 (diff)
Combine all license matters in LICENSE
We use some OpenBSD code in util.c (namely by Ted Unangst, Todd C. Miller and Otto Moerbeek), which is licensed under the ISC license. To make it clearer and make it easier to see what farbfeld really is licensed under, we include these authors in the LICENSE file and remove the explicit headers from util.c. While at it, we also remove superfluous includes and shove them to the top.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE15
1 files changed, 10 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 30c84f5..1bf035c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,6 +2,15 @@ ISC-License
(c) 2014-2017 Laslo Hunhold <dev@frign.de>
+(c) 2004 Ted Unangst <tedu@openbsd.org>
+(c) 2004 Todd C. Miller <Todd.Miller@courtesan.com>
+(c) 2008 Otto Moerbeek <otto@drijf.net>
+(c) 2014-2015 Dimitris Papastamos <sin@2f30.org>
+(c) 2014-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
+(c) 2015 Willy Goiffon <willy@mailoo.org>
+(c) 2016 Alexander Krotov <ilabdsf@yandex.ru>
+(c) 2017 Mattias Andrée <maandree@kth.se>
+
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
@@ -14,8 +23,4 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-(c) 2014-2015 Dimitris Papastamos <sin@2f30.org>
-(c) 2014-2016 Hiltjo Posthuma <hiltjo@codemadness.org>
-(c) 2015 Willy Goiffon <willy@mailoo.org>
-(c) 2016 Alexander Krotov <ilabdsf@yandex.ru>
-(c) 2017 Mattias Andrée <maandree@kth.se>
+