Commit4f6da17

authored

Merge branch 'master' into remove-deprecated-api

2 parents7cb00ee +29978d8 commit4f6da17Copy full SHA for 4f6da17

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`- Alexandre Catarino([@AlexCatarino](https://github.com/AlexCatarino))`
`21`	`21`	`- Andrey Sant'Anna ([@andreydani](https://github.com/andreydani))`
`22`	`22`	`- Arvid JB ([@ArvidJB](https://github.com/ArvidJB))`
	`23`	`+- Avinash Maddikonda ([@SFM61319](https://github.com/SFM61319))`
`23`	`24`	`- Benoît Hudson ([@benoithudson](https://github.com/benoithudson))`
`24`	`25`	`- Bradley Friedman ([@leith-bartrich](https://github.com/leith-bartrich))`
`25`	`26`	`- Callum Noble ([@callumnoble](https://github.com/callumnoble))`
`@@ -75,4 +76,3 @@`
`75`	`76`	`- ([@stonebig](https://github.com/stonebig))`
`76`	`77`	`- ([@testrunner123](https://github.com/testrunner123))`
`77`	`78`	`- ([@DanBarzilian](https://github.com/DanBarzilian))`
`78`		`-`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ Calling .NET code from Python`
`24`	`24`
`25`	`25`	`Python.NET allows CLR namespaces to be treated essentially as Python packages.`
`26`	`26`
`27`		`-..code-block::`
	`27`	`+..code-block::python`
`28`	`28`
`29`	`29`	`import clr`
`30`	`30`	`from Systemimport String`
`@@ -33,7 +33,7 @@ Python.NET allows CLR namespaces to be treated essentially as Python packages.`
`33`	`33`	To load an assembly, use the ``AddReference`` function in the ``clr``
`34`	`34`	`module:`
`35`	`35`
`36`		`-..code-block::`
	`36`	`+..code-block::python`
`37`	`37`
`38`	`38`	`import clr`
`39`	`39`	`clr.AddReference("System.Windows.Forms")`
`@@ -85,7 +85,7 @@ Example`
`85`	`85`
`86`	`86`	`Output:`
`87`	`87`
`88`		`-..code::`
	`88`	`+..code::csharp`
`89`	`89`
`90`	`90`	`1.0`
`91`	`91`	`-0.958924274663`

Comments

(0)