Commit 760a7310 authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)

Merge mysql.com:/home/kent/bk/tmp/mysql-4.0

into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
parents e51c32f0 7c4385c4
...@@ -4,7 +4,7 @@ The MySQL AB Exception for Free/Libre and Open Source ...@@ -4,7 +4,7 @@ The MySQL AB Exception for Free/Libre and Open Source
Software-only Applications Using MySQL Client Libraries (the Software-only Applications Using MySQL Client Libraries (the
"FLOSS Exception"). "FLOSS Exception").
Version 0.5, 30 August 2006 Version 0.6, 7 March 2007
Exception Intent Exception Intent
...@@ -59,10 +59,12 @@ Apache Software License 1.0/1.1/2.0 ...@@ -59,10 +59,12 @@ Apache Software License 1.0/1.1/2.0
Apple Public Source License 2.0 Apple Public Source License 2.0
Artistic license From Perl 5.8.0 Artistic license From Perl 5.8.0
BSD license "July 22 1999" BSD license "July 22 1999"
Common Development and Distribution License (CDDL) 1.0
Common Public License 1.0 Common Public License 1.0
Eclipse Public License 1.0
GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1 GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
Jabber Open Source License 1.0 Jabber Open Source License 1.0
MIT license --- MIT license (As listed in file MIT-License.txt) ---
Mozilla Public License (MPL) 1.0/1.1 Mozilla Public License (MPL) 1.0/1.1
Open Software License 2.0 Open Software License 2.0
OpenSSL license (with original SSLeay license) "2003" ("1998") OpenSSL license (with original SSLeay license) "2003" ("1998")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment