Merge remote branch 'upstream/master'

[mono.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index e3b8e0fdf375b01edeca377a925e52056d42cd03..0cb310e112686e2e4eafcfcf4274d5c5fa2cd9c0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -37,8 +37,8 @@ For comments, corrections and updates, please contact mono@novell.com
 
        We consider non-LGPL use instances where you use this on an
        embedded system where the end user is not able to upgrade the
 
        We consider non-LGPL use instances where you use this on an
        embedded system where the end user is not able to upgrade the

-       Moonlight installation or distribution that is part of your
-       product (Section 6 and 7), you would have to obtain a
+       Mono VM or Moonlight installation or distribution that is part
+       of your product (Section 6 and 7), you would have to obtain a

        commercial license from Novell (consider software burned into
        a ROM, systems where end users would not be able to upgrade,
        an embedded console, a game console that imposes limitations
        commercial license from Novell (consider software burned into
        a ROM, systems where end users would not be able to upgrade,
        an embedded console, a game console that imposes limitations


@@ -54,6 +54,18 @@ For comments, corrections and updates, please contact mono@novell.com
        the terms of the MIT X11, this means that this code can be
        used for any purposes by anyone.
 
        the terms of the MIT X11, this means that this code can be
        used for any purposes by anyone.
 

+** mono/metadata/sgen*: Mono's Copying Collector
+
+       This new garbage collector is licensed under the terms of
+       the MIT X11 license, in hopes that the GC could be reused
+       by third party projects, follows the same spirit than the
+       Boehm GC.
+
+** mono/arch/*/XXX-codegen.h
+
+       This are C macros that are useful when generating native
+       code on various platforms.   This code is MIT X11 licensed.
+

 ** mcs/mcs, mcs/gmcs
 
        The C# Compilers (1.0 and 2.0)
 ** mcs/mcs, mcs/gmcs
 
        The C# Compilers (1.0 and 2.0)


@@ -86,6 +98,13 @@ For comments, corrections and updates, please contact mono@novell.com
             ICSharpCode.SharpZipLib, GPL with exceptions.
                See: mcs/class/ICSharpCode.SharpZipLib/README
 
             ICSharpCode.SharpZipLib, GPL with exceptions.
                See: mcs/class/ICSharpCode.SharpZipLib/README
 

+** mcs/class/System.Core/System/TimeZoneInfo.Android.cs
+
+       This is a port of Apache 2.0-licensed Android code, and thus is
+       licensed under the Apache 2.0 license:
+
+           http://www.apache.org/licenses/LICENSE-2.0
+

             
 ** mcs/tools
 
             
 ** mcs/tools