summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2018-03-22 07:26:59 +0100
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2018-03-22 07:26:59 +0100
commit9da10f705434d2a18d1ac3670f16d9b10e77f10c (patch)
tree5fb118d3fa2a2193faf3758898ee7fe2b6abb549 /COPYING
parent12af0f6afae11029a608e33b98047aea4e82da7d (diff)
parent52052c161e3230d27658d819be68abd4597aa6eb (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING18
1 files changed, 9 insertions, 9 deletions
diff --git a/COPYING b/COPYING
index f7a735f..755e23a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,13 @@
-uriparser - RFC 3986 URI parsing library
-
-Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
-Copyright (C) 2007, Sebastian Pipping <webmaster@hartwork.org>
-All rights reserved.
-
+uriparser - RFC 3986 URI parsing library
+
+Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
+Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org>
+All rights reserved.
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
-are met:
-
+are met:
+
* Redistributions of source code must retain the above
copyright notice, this list of conditions and the following
disclaimer.
@@ -21,7 +21,7 @@ are met:
contributors may be used to endorse or promote products
derived from this software without specific prior written
permission.
-
+
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 WARRANTIES OF MERCHANTABILITY AND FITNESS