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.

Sign up for GitHub

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

Jump to bottom

add bsd license to launch due to files from roslaunch #456

Merged
merged 2 commits into from
Aug 20, 2020
Merged

add bsd license to launch due to files from roslaunch #456

merged 2 commits into from
Aug 20, 2020

Conversation

wjwwood
Copy link
Member

@wjwwood wjwwood commented Aug 20, 2020

fixes #439

@wjwwood wjwwood requested a review from dirk-thomas August 20, 2020 16:18
@wjwwood wjwwood self-assigned this Aug 20, 2020
@dirk-thomas
Copy link
Member

Should the LICENSE file in the root of the repo also reflect this?

@wjwwood
Copy link
Member Author

wjwwood commented Aug 20, 2020

Yeah, but also I screwed up the package.xml, it should be a different package. I'll fix it up.

dirk-thomas
dirk-thomas approved these changes Aug 20, 2020
View reviewed changes
Copy link
Member

@dirk-thomas dirk-thomas left a comment

Choose a reason for hiding this comment

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

(I hope GitHub can handle these two licenses in the LICENSE file when extracting the information about the repo.)

@wjwwood wjwwood merged commit 4370b2b into master Aug 20, 2020
@wjwwood wjwwood deleted the wjwwood-patch-1 branch August 20, 2020 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dirk-thomas dirk-thomas dirk-thomas approved these changes

Assignees

@wjwwood wjwwood

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

clarify inconsistent license
2 participants
@wjwwood @dirk-thomas