Revision: 260
http://www.exim.org/viewvc/pcre2?view=rev&revision=260
Author: ph10
Date: 2015-04-28 17:01:59 +0100 (Tue, 28 Apr 2015)
Log Message:
-----------
Update licence to specify that the test data is public domain, and remove
obsolete reference to Google.
Modified Paths:
--------------
code/trunk/LICENCE
Modified: code/trunk/LICENCE
===================================================================
--- code/trunk/LICENCE 2015-04-27 07:02:34 UTC (rev 259)
+++ code/trunk/LICENCE 2015-04-28 16:01:59 UTC (rev 260)
@@ -6,7 +6,8 @@
Release 10 of PCRE2 is distributed under the terms of the "BSD" licence, as
specified below. The documentation for PCRE2, supplied in the "doc"
-directory, is distributed under the same terms as the software itself.
+directory, is distributed under the same terms as the software itself. The data
+in the testdata directory is not copyrighted and is in the public domain.
The basic library functions are written in C and are freestanding. Also
included in the distribution is a just-in-time compiler that can be used to
@@ -63,10 +64,9 @@
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- * Neither the name of the University of Cambridge nor the name of Google
- Inc. nor the names of their contributors may be used to endorse or
- promote products derived from this software without specific prior
- written permission.
+ * Neither the name of the University of Cambridge nor the names of any
+ 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
