List the MS-PL in the README.

icsharpcode · Jun 29, 2014 · 8644581 · 8644581
1 parent db1d106
commit 8644581
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/ILSpy/AboutPage.cs b/ILSpy/AboutPage.cs
@@ -95,6 +95,7 @@ public static void Display(DecompilerTextView textView)
 			output.AddVisualLineElementGenerator(new MyLinkElementGenerator("SharpDevelop", "http://www.icsharpcode.net/opensource/sd/"));
 			output.AddVisualLineElementGenerator(new MyLinkElementGenerator("MIT License", "resource:license.txt"));
 			output.AddVisualLineElementGenerator(new MyLinkElementGenerator("LGPL", "resource:LGPL.txt"));
+			output.AddVisualLineElementGenerator(new MyLinkElementGenerator("MS-PL", "resource:MS-PL.txt"));
 			textView.ShowText(output);
 		}
 

diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
@@ -230,6 +230,9 @@
     <EmbeddedResource Include="..\doc\license.txt">
       <Link>license.txt</Link>
     </EmbeddedResource>
+    <EmbeddedResource Include="..\doc\MS-PL.txt">
+      <Link>MS-PL.txt</Link>
+    </EmbeddedResource>
     <Resource Include="Images\AssemblyList.png" />
     <Resource Include="Images\AssemblyListGAC.png" />
     <Resource Include="Images\AssemblyWarning.png" />

diff --git a/README.txt b/README.txt
@@ -9,6 +9,7 @@ Included open-source libraries:
  AvalonEdit: LGPL
  SharpTreeView: LGPL
  ICSharpCode.Decompiler: MIT License (developed as part of ILSpy)
+ Ricciolo.StylesExplorer: MS-PL (part of ILSpy.BamlDecompiler.Plugin)
 
 ILSpy Contributors:
 	Daniel Grunwald

diff --git a/doc/copyright.txt b/doc/copyright.txt
@@ -1,4 +1,4 @@
-Copyright 2011-2012 for the SharpDevelop team
+Copyright 2011-2014 for the SharpDevelop team
 by
 
   AlphaSierraPapa, Christoph Wille

diff --git a/doc/license.txt b/doc/license.txt
@@ -1,10 +1,12 @@
 The following MIT license applies to ILSpy, NRefactory and ICSharpCode.Decompiler.
 Mono.Cecil also uses the MIT license (Copyright JB Evain).
 AvalonEdit and SharpTreeView use LGPL, which can be found in the LGPL.txt file.
+ILSpy.BamlDecompiler uses the MS-PL, which can be found in the MS-PL.txt file.
+
 
 MIT license:
 
-Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop team
+Copyright (c) 2011-2014 AlphaSierraPapa for the SharpDevelop team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software