New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added shore gpl warning in the readme #525

Merged
merged 2 commits into from Dec 28, 2014

Conversation

Projects
None yet
3 participants
@samuelstjean
Contributor

samuelstjean commented Dec 28, 2014

Followup of #524 to make the licensing issues clearer.

samuelstjean added some commits Dec 28, 2014

@arokem

This comment has been minimized.

Member

arokem commented Dec 28, 2014

Seems fine to me.

Dipy is licensed under the terms of the BSD license. Some code included with
dipy is also licensed under the BSD license. Please see the LICENSE file in the dipy distribution.
Dipy is licensed under the terms of the BSD license.
Some code included with dipy is also licensed under the BSD license.

This comment has been minimized.

@Garyfallidis

Garyfallidis Dec 28, 2014

Member

No this needs to be changed. Some code ???

This comment has been minimized.

@arokem

arokem Dec 28, 2014

Member

That was there before this PR. I agree - looks weird.

On Sun, Dec 28, 2014 at 11:14 AM, Eleftherios Garyfallidis <
notifications@github.com> wrote:

In README.rst
#525 (diff):

@@ -34,5 +34,9 @@ You can find our sources and single-click downloads:
License

-Dipy is licensed under the terms of the BSD license. Some code included with
-dipy is also licensed under the BSD license. Please see the LICENSE file in the dipy distribution.
+Dipy is licensed under the terms of the BSD license.
+Some code included with dipy is also licensed under the BSD license.

No this needs to be changed. Some code ???


Reply to this email directly or view it on GitHub
https://github.com/nipy/dipy/pull/525/files#r22299531.

@Garyfallidis

This comment has been minimized.

Member

Garyfallidis commented Dec 28, 2014

Okay I am merging this as it and will make a new PR with more corrections on the license.

Garyfallidis added a commit that referenced this pull request Dec 28, 2014

Merge pull request #525 from samuelstjean/shore_gpl_readme
Added shore gpl warning in the readme

@Garyfallidis Garyfallidis merged commit 4293462 into nipy:master Dec 28, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details

@samuelstjean samuelstjean deleted the samuelstjean:shore_gpl_readme branch Dec 28, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment