Skip to content

Commit

Permalink
[ISSUE #8] added Apache License 2, stated in README
Browse files Browse the repository at this point in the history
  • Loading branch information
AJ ONeal committed Dec 10, 2011
1 parent 25d4614 commit cb62ebe
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 26 deletions.
26 changes: 0 additions & 26 deletions LICENSE

This file was deleted.

15 changes: 15 additions & 0 deletions LICENSE.APACHE2
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Apache License, Version 2.0

Copyright (c) 2011 Dominic Tarr, Christopher McKenzie

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
24 changes: 24 additions & 0 deletions LICENSE.MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
The MIT License

Copyright (c) 2011 Dominic Tarr, Christopher McKenzie

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.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,11 @@ bashvar=`` Var.Data.pop() ``

<sup>1</sup>Although Javascript supports $ prefixed variables, this does not.

## LICENSE

This software is available under the following licenses:

* MIT
* Apache 2

Parts of this work are derived from [JSON.sh](https://github.com/dominictarr/JSON.sh), which is also available under the aforementioned licenses.

0 comments on commit cb62ebe

Please sign in to comment.