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

synced GNU 2.0 license with current version from gnu. #70

Closed
wants to merge 1 commit into from
Closed

synced GNU 2.0 license with current version from gnu. #70

wants to merge 1 commit into from

Conversation

weberhofer
Copy link
Contributor

I think the License should be update to be a proper one.

@lucaswerkmeister
Copy link
Member

lucaswerkmeister commented Oct 9, 2016 •
edited
Loading

What’s the difference between this pull request and #24? According to the GitHub web UI, the commit to be merged is the same (f0a0b86), and both want to merge into GeSHi:master. But #24 was already merged…

EDIT: Correction – it wasn’t merged, but rebased as 397616b, if I understand correctly.

@weberhofer
Copy link
Contributor Author

The old request has been closed without merging. As I stumbled over the old FSF address again I have created a new request; the license is still out of date.

@lucaswerkmeister
Copy link
Member

Well, I see the new address now in COPYING, and if I merge your branch locally, the merge introduces no changes (git diff @^1 is empty).

@splitbrain splitbrain mentioned this pull request Mar 12, 2017
Closed
12 tasks
@splitbrain
Copy link
Contributor

I think this can be closed

@cweiske cweiske closed this Mar 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@weberhofer @lucaswerkmeister @splitbrain @cweiske