Skip to content

Commit

Permalink
docs: add LICENSE.md and set license to CC-BY-2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
t1st3 committed Jan 19, 2016
1 parent 0f4df1b commit 124601f
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 46 deletions.
37 changes: 37 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
Original readme (from author of the icons)
----------

Silk icon set 1.3

_________________________________________

Mark James
http://www.famfamfam.com/lab/icons/silk/

_________________________________________

This work is licensed under a
Creative Commons Attribution 2.5 License.
[ http://creativecommons.org/licenses/by/2.5/ ]

This means you may use it for any purpose,
and make any changes you like.
All I ask is that you include a link back
to this page in your credits.

Are you using this icon set? Send me an email
(including a link or picture if available) to
mjames@gmail.com

Any other questions about this icon set please
contact mjames@gmail.com



About the rest (all this repository but the icons)
----------

All the content of this repository (excepted the icon pack)
is licensed under the [MIT license](http://opensource.org/licenses/MIT).

Though, it is just composed a few trivial json files and a Readme.
42 changes: 0 additions & 42 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,48 +99,6 @@ Install-Package famfamfam-silk
```



Original readme (from author of the icons)
----------

Silk icon set 1.3

_________________________________________

Mark James
http://www.famfamfam.com/lab/icons/silk/

_________________________________________

This work is licensed under a
Creative Commons Attribution 2.5 License.
[ http://creativecommons.org/licenses/by/2.5/ ]

This means you may use it for any purpose,
and make any changes you like.
All I ask is that you include a link back
to this page in your credits.

Are you using this icon set? Send me an email
(including a link or picture if available) to
mjames@gmail.com

Any other questions about this icon set please
contact mjames@gmail.com



About the rest (all this repository but the icons)
----------

All the content of this repository (excepted the icon pack)
is licensed under the [MIT license](http://opensource.org/licenses/MIT).

Though, it is just composed a few trivial json files and a Readme.




Build (the whole project or your custom project)
----------

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"png",
"gif"
],
"license": "MIT",
"license": "CC-BY-2.5",
"authors": [
"t1st3 <contact@tiste.org> (http://www.tiste.org/)"
],
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"png",
"gif"
],
"license": "MIT",
"license": "CC-BY-2.5",
"authors": [
{
"name": "T1st3",
Expand Down
2 changes: 1 addition & 1 deletion nuget/famfamfam-silk.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<language>en-us</language>
<projectUrl>https://github.com/T1st3/famfamfam-silk</projectUrl>
<iconUrl>https://raw.githubusercontent.com/T1st3/famfamfam-silk/master/dist/sprite/famfamfam-silk.png</iconUrl>
<licenseUrl>https://github.com/T1st3/famfamfam-silk#original-readme-from-author-of-the-icons</licenseUrl>
<licenseUrl>https://github.com/T1st3/famfamfam-silk/LICENSE.md</licenseUrl>
<copyright>Copyright 2015</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"png",
"gif"
],
"license": "MIT",
"license": "CC-BY-2.5",
"author": "t1st3 <contact@tiste.org> (http://www.tiste.org/)",
"repository": {
"type": "git",
Expand Down

0 comments on commit 124601f

Please sign in to comment.