projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'upstream/master'
[mono.git]
/
LICENSE
diff --git
a/LICENSE
b/LICENSE
index e9655394176bfd6b807e12637877b17526b573f5..0cb310e112686e2e4eafcfcf4274d5c5fa2cd9c0 100644
(file)
--- a/
LICENSE
+++ b/
LICENSE
@@
-61,6
+61,11
@@
For comments, corrections and updates, please contact mono@novell.com
by third party projects, follows the same spirit than the
Boehm GC.
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)
@@
-93,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