Skip to content
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 Epidemico and emails to the readme #450

Merged
merged 4 commits into from Oct 10, 2015
Merged

Conversation

aashish24
Copy link
Member

@dcjohnston @nicopresto @jbeezley please review. Any suggestion would be useful.

Copyright 2015 Kitware Inc.

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The license file in the repository contains the 3-clause BSD license. You should update that as well as the license line in package.json.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbeezley thanks...for catching this. I will update the license file and the license file in package.json.

@aashish24
Copy link
Member Author

@jbeezley @dcjohnston @nicopresto please review

same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fill in the blanks.

@jbeezley
Copy link
Contributor

jbeezley commented Oct 9, 2015

Other than the copyright statement, it LGTM.

@aashish24
Copy link
Member Author

Other than the copyright statement, it LGTM.

I realized that too but then when I looked at Girder LICENSE, it has APPENDIX as well. See here https://github.com/Kitware/girder/blob/master/LICENSE so I left it thinking its custom to keep the entire text. Since the agreement ends before that so I will take it out.

aashish24 added a commit that referenced this pull request Oct 10, 2015
Added Epidemico and emails to the readme
@aashish24 aashish24 merged commit f5575e3 into master Oct 10, 2015
@aashish24 aashish24 deleted the readme_minor_changes branch October 10, 2015 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants