Permalink
Browse files

Merge branch 'master' of github.com:dominictarr/JSON.sh

  • Loading branch information...
2 parents 360b592 + a615139 commit 54397c3e9965acaa075f38932c332aaa92bb042c @dominictarr committed Jan 14, 2012
Showing with 26 additions and 2 deletions.
  1. +15 −0 LICENSE.APACHE2
  2. +3 −1 LICENCE → LICENSE.MIT
  3. +8 −1 readme.markdown → README.md
View
@@ -0,0 +1,15 @@
+Apache License, Version 2.0
+
+Copyright (c) 2011 Dominic Tarr
+
+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.
View
@@ -1,3 +1,5 @@
+The MIT License
+
Copyright (c) 2011 Dominic Tarr
Permission is hereby granted, free of charge,
@@ -19,4 +21,4 @@ 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.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -30,4 +30,11 @@ curl registry.npmjs.org/express | ./JSON.sh | egrep '\["versions","[^"]*"\]'
## Examples
If you have any examples with JSON.sh, streaming twitter, github, or whatever!
-please issue a pull request and i will include them.
+please issue a pull request and i will include them.
+
+## LICENSE
+
+This software is available under the following licenses:
+
+ * MIT
+ * Apache 2

0 comments on commit 54397c3

Please sign in to comment.