summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authornigel <nigel@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-02-24 21:39:42 +0000
committernigel <nigel@2f5784b3-3f2a-0410-8824-cb99058d5e15>2007-02-24 21:39:42 +0000
commit93751f5e0bbc35cf20c27d1e17c070555671f4f1 (patch)
tree8f552f729ff6fee21de091d696e94e2890931c7d /COPYING
parente87cad160ebb5eefbd74344fc0c78318432ae433 (diff)
downloadpcre-93751f5e0bbc35cf20c27d1e17c070555671f4f1.tar.gz
Load pcre-3.5 into code/trunk.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@53 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING10
1 files changed, 7 insertions, 3 deletions
diff --git a/COPYING b/COPYING
index 34d20db..8effa66 100644
--- a/COPYING
+++ b/COPYING
@@ -9,7 +9,7 @@ Written by: Philip Hazel <ph10@cam.ac.uk>
University of Cambridge Computing Service,
Cambridge, England. Phone: +44 1223 334714.
-Copyright (c) 1997-2000 University of Cambridge
+Copyright (c) 1997-2001 University of Cambridge
Permission is granted to anyone to use this software for any purpose on any
computer system, and to redistribute it freely, subject to the following
@@ -40,7 +40,11 @@ restrictions:
misrepresented as being the original software.
4. If PCRE is embedded in any software that is released under the GNU
- General Purpose Licence (GPL), then the terms of that licence shall
- supersede any condition above with which it is incompatible.
+ General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL),
+ then the terms of that licence shall supersede any condition above with
+ which it is incompatible.
+
+The documentation for PCRE, supplied in the "doc" directory, is distributed
+under the same terms as the software itself.
End