Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Changed license to be MIT #1696

Merged
merged 9 commits into from
Oct 30, 2012
Merged

Changed license to be MIT #1696

merged 9 commits into from
Oct 30, 2012

Conversation

davejohnson
Copy link
Contributor

Removed wording from the license file so that it is indeed the MIT license as stated in the about section at http://brackets.io/

@pthiess
Copy link
Contributor

pthiess commented Sep 20, 2012

Hi Dave,

We will need a NOTICE file for the notice you removed. Please add this to your pull request.

Thanks,
Peter

@ghost ghost assigned pthiess Sep 20, 2012
@davejohnson
Copy link
Contributor Author

Ok thanks Peter.

On Thursday, September 20, 2012, Peter Thiess wrote:

Hi Dave,

We will need a NOTICE file for the notice you removed. Please add this to
your pull request.

Thanks,
Peter


Reply to this email directly or view it on GitHubhttps://github.com//pull/1696#issuecomment-8737870.

@davejohnson
Copy link
Contributor Author

Added the NOTICE with all third party libs and their licenses

@davejohnson
Copy link
Contributor Author

Oh and also added an awesome empty merge commit :)

@njx
Copy link
Contributor

njx commented Sep 20, 2012

Oh and also added an awesome empty merge commit :)

Good, you're following our existing style :)

(We'll get better about rebasing and keeping a clean commit history one of these days...)

@adrocknaphobia
Copy link
Contributor

What is with @GarthDB's commits? Did he try to convert the MIT license to SVG?

@GarthDB
Copy link
Member

GarthDB commented Oct 26, 2012

Probably

On Thursday, October 25, 2012, Adam Lehman wrote:

What is with @GarthDB https://github.com/GarthDB's commits? Did he try
to convert the MIT license to SVG?


Reply to this email directly or view it on GitHubhttps://github.com//pull/1696#issuecomment-9802104.

@adrocknaphobia
Copy link
Contributor

Well.... i don't think I should merge this with the random commits from @GarthDB and @gruehle. How can I know those commits out of the pull request?

@GarthDB
Copy link
Member

GarthDB commented Oct 26, 2012

how did all those random commits get in there? They don't seem to correspond

@njx
Copy link
Contributor

njx commented Oct 26, 2012

Not sure, but it might be worth just trying to merge the branch with master manually (in a local repo), and then looking at the diffs to see if there are any diffs besides the license stuff. If so, then it's probably okay (though there might be some redundant commits).

If we want to really be clean, we could just cherry-pick Dave's commits.

@gruehle
Copy link
Member

gruehle commented Oct 26, 2012

I did a local test merge and everything is clean.

These are the commands I ran:

# From an up-to-date master branch
git checkout -b davejohnson/license
git pull https://github.com/davejohnson/brackets.git license
git diff master

adrocknaphobia added a commit that referenced this pull request Oct 30, 2012
Created NOTICE file to store 3rd-party licenses and other notices so that the LICENSE file is pure unadulterated MIT (http://opensource.org/licenses/MIT).
@adrocknaphobia adrocknaphobia merged commit bfd6760 into adobe:master Oct 30, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants