Merge pull request #266 from joncham/bug-struct-pack-size

[mono.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index af6f96030c8b65da5d1bd6187abacb35f955768b..0c52cc7dc9580339505658e89441c8d48e7cdf82 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -2,14 +2,14 @@
 Mono is made up of many pieces of code, all of them open source, but
 different pieces of Mono use different licensing terms.
 
-For comments, corrections and updates, please contact mono@novell.com
+For comments, corrections and updates, please contact mono@xamarin.com
 
 * Dual Licensing
 
        Parts of Mono are dual licensed, they are available to the
        public in GPL or LGPL forms, but we also offer those pieces
-       under commercial terms from Novell for when the GPL and the
-       LGPL are not suitable.
+       under commercial terms from Xamarin for the cases wher the GPL
+       and the LGPL are not suitable.
 
        We have tried to pick the licenses that will maximize adoption
        of Mono, so we tend to use the MIT X11 or LGPL liceses.
@@ -22,7 +22,10 @@ For comments, corrections and updates, please contact mono@novell.com
        Contributions for other modules should be under the same license
        terms as the rest of the module, or under MIT X11 terms. 
 
-       If you ned further information, please contact mono@novell.com
+       For the actual license links in the Mono distribution see the
+       bottom of this file.
+
+       If you need further information, please contact mono@xamarin.com
 
 * The Modules
 
@@ -31,21 +34,21 @@ For comments, corrections and updates, please contact mono@novell.com
        This code is dual licensed under the LGPL or commercial licenses. 
 
        The LGPL ensures that Mono can be used in most scenarios, but
-       gives Novell the flexibility to relicense the code for
+       gives Xamarin the flexibility to relicense the code for
        embedded systems, static linking or commercial settings where
        the LGPL can not be used.
 
        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
-       commercial license from Novell (consider software burned into
+       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 Xamarin (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
        on the distribution and access to the code, a phone platform
        that prevents end users from upgrading Moonlight).
        
-       Contact mono@novell.com for details on obtaining the Mono
+       Contact mono@xamarin.com for details on obtaining the Mono
        runtime under other terms.
 
 ** mono/eglib: Mono's X11 glib implementation
@@ -54,12 +57,24 @@ 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.
 
+** 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)
 
-       These compilers are dual licensed under the GPL and commercial
-       terms.
+       These compilers are dual licensed under the GPL and MIT X11
+       license terms.
 
 ** tests
 
@@ -86,6 +101,13 @@ For comments, corrections and updates, please contact mono@novell.com
             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