Skip to content
Browse files

Make LICENSE clear.

Signed-off-by: Zachary Waldowski <zwaldowski@gmail.com>
  • Loading branch information...
1 parent bab7a36 commit a4f62111b966be0983849fe69c03db972f740b6c @zwaldowski committed Sep 17, 2011
Showing with 21 additions and 4 deletions.
  1. +12 −0 LICENSE
  2. +9 −4 README.md
View
12 LICENSE
@@ -0,0 +1,12 @@
+//
+// LICENSE
+// BlocksKit
+//
+
+Copyright (c) 2011 Zachary Waldowski and the BlocksKit Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13 README.md
@@ -40,19 +40,25 @@ An Xcode 4 compatible documentation set is available [using this Atom link](http
You can also view the documentation online [at my website](http://dizzytechnology.com/data/BlocksKit).
+License
+=======
+
+BlocksKit is created and maintained by Zachary Waldowski under the MIT license [(hello, nice to meet you)](https://github.com/zwaldowski). All of the included code is licensed either under BSD, MIT, or is in the public domain. The project itself is free for use in any and all projects.
+
+Unsure about your rights? [Read more.](http://www.opensource.org/licenses/mit-license.php)
+
Contributors
============
-BlocksKit takes, repurposes, fiddles with, and groups together a variety of block-related code generally found here on GitHub. All of the included code is licensed either under BSD, MIT, or is in the public domain. The project itself is free for use in any and all projects and is licensed under MIT.
+BlocksKit takes, repurposes, fiddles with, and groups together a variety of block-related code generally found here on GitHub.
The following people (in alphabetical order) have their code lovingly enshrined in BlocksKit:
* [Michael Ash](https://github.com/mikeash).
* [Jiva DeVoe](https://github.com/jivadevoe).
* [Igor Evsukov](https://github.com/evsukov89).
* [Corey Floyd](https://github.com/coreyfloyd).
-* [Landon Fuller, Plausible Labs](http://plausiblelabs.com).
-* [Martin Hering](https://github.com/vemedio).
+* [Landon Fuller](http://plausiblelabs.com).
* [Mirko Kiefer](https://github.com/mirkok).
* [Robin Lu](https://github.com/robin).
* [Jake Marsh](https://github.com/jakemarsh).
@@ -63,7 +69,6 @@ The following people (in alphabetical order) have their code lovingly enshrined
* [Peter Steinberger](https://github.com/steipete).
* [Jon Sterling](https://github.com/jonsterling).
* [Martin Schürrer](https://github.com/MSch).
-* [Zach Waldowski](https://github.com/zwaldowski).
* [Jonathan Wight](https://github.com/schwa).
Individual credits exist in the header files and, consequently, in the documentation.

0 comments on commit a4f6211

Please sign in to comment.
Something went wrong with that request. Please try again.