about summary refs log tree commit diff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authornsz <nsz@port70.net>2012-03-26 13:47:31 +0200
committernsz <nsz@port70.net>2012-03-26 13:47:31 +0200
commite68a4633e01e1a9ef41fa6dbc39d1d93dca130d3 (patch)
tree6e774ea5863925c49b6da15b25adc20d1ec192b4 /COPYRIGHT
parentc5ec5b2ce93bd87eb3dbf966d8bf279089f8a35d (diff)
parenta9014ac1b9bc813a21752cd40e0a73441860e6e6 (diff)
downloadmusl-e68a4633e01e1a9ef41fa6dbc39d1d93dca130d3.tar.gz
musl-e68a4633e01e1a9ef41fa6dbc39d1d93dca130d3.tar.xz
musl-e68a4633e01e1a9ef41fa6dbc39d1d93dca130d3.zip
Merge branch 'master' of git://git.etalabs.net/musl
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT8
1 files changed, 4 insertions, 4 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 730e04a4..d46826c0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -4,10 +4,10 @@ See the file COPYING for the text of this license.
 See below for the copyright status on all code included in musl:
 
 The TRE regular expression implementation (src/regex/reg* and
-src/regex/tre*) is Copyright © 2001-2006 Ville Laurikari and licensed
-under the terms of the GNU LGPL version 2.1 or later. The included
-version was heavily modified in Spring 2006 by Rich Felker in the
-interests of size, simplicity, and namespace cleanliness.
+src/regex/tre*) is Copyright © 2001-2008 Ville Laurikari and licensed
+under a 2-clause BSD license (license text in the source files). The
+included version has been heavily modified by Rich Felker in 2012, in
+the interests of size, simplicity, and namespace cleanliness.
 
 Most of the math library code (src/math/* and src/complex/*) is
 Copyright © 1993,2004 Sun Microsystems or