Commit ebdb47b

author

Shunichi09

authored

Merge pull request #8 from Shunichi09/develop

Fix licenses

2 parents 222b606 + fe38dc4 commit ebdb47bCopy full SHA for ebdb47b

File tree

+682

-2

lines changed

+682

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)`
`2`	`1`	`[![Coverage Status](https://coveralls.io/repos/github/Shunichi09/PythonLinearNonlinearControl/badge.svg?branch=master&service=github)](https://coveralls.io/github/Shunichi09/PythonLinearNonlinearControl?branch=master&service=github)`
`3`	`2`	`[![GitHub issues open](https://img.shields.io/github/issues/Shunichi09/PythonLinearNonlinearControl.svg)]()`
`4`	`3`	`[![Build Status](https://travis-ci.org/Shunichi09/PythonLinearNonlinearControl.svg?branch=master&service=github)](https://travis-ci.org/Shunichi09/PythonLinearNonlinearControl)`
`@@ -213,7 +212,14 @@ Coming soon !!`
`213`	`212`
`214`	`213`	`# License`
`215`	`214`
`216`		`-[MIT License](LICENSE).`
	`215`	`+PythonLinearNonlinearControl is licensed under the MIT License. However, some scripts are available under different license terms. See below.`
	`216`	`+`
	`217`	`+The following parts are licensed under GPL3+:`
	`218`	`+`
	`219`	`+- [ilqr](PythonLinearNonlinearControl/controllers/ilqr.py)`
	`220`	`+- [ddp](PythonLinearNonlinearControl/controllers/ddp.py)`
	`221`	`+`
	`222`	`+See the [licenses folder](./licenses) for the full text of the licenses.`
`217`	`223`
`218`	`224`	`# Citation`
`219`	`225`

Comments

(0)