Merge with 3.5

This commit is contained in:
Zachary Ware 2016-02-03 22:07:08 -06:00
commit e922289620

View File

@ -60,7 +60,7 @@ Python for .NET
This implementation actually uses the CPython implementation, but is a managed This implementation actually uses the CPython implementation, but is a managed
.NET application and makes .NET libraries available. It was created by Brian .NET application and makes .NET libraries available. It was created by Brian
Lloyd. For more information, see the `Python for .NET home page Lloyd. For more information, see the `Python for .NET home page
<http://pythonnet.sourceforge.net>`_. <https://pythonnet.github.io/>`_.
IronPython IronPython
An alternate Python for .NET. Unlike Python.NET, this is a complete Python An alternate Python for .NET. Unlike Python.NET, this is a complete Python