Permalink
Browse files

Modified the JSONKit so that it is dual licensed under either the BSD…

… or Apache v2.0 license. This was motivated by the discussion at facebookarchive/three20#465
  • Loading branch information...
1 parent 1b123b6 commit 3c6ff505366b80a9c96b9ef83bd7c202b6c9999b @johnezang committed Mar 28, 2011
Showing with 37 additions and 2 deletions.
  1. +19 −1 JSONKit.h
  2. +18 −1 JSONKit.m
View
@@ -1,7 +1,9 @@
//
// JSONKit.h
// http://github.com/johnezang/JSONKit
-// Licensed under the terms of the BSD License, as specified below.
+// http://github.com/johnezang/JSONKit
+// Dual licensed under either the terms of the BSD License, or alternatively
+// under the terms of the Apache License, Version 2.0, as specified below.
//
/*
@@ -36,6 +38,22 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ Copyright 2011 John Engelhart
+
+ 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.
+*/
+
#include <stddef.h>
#include <stdint.h>
#include <limits.h>
View
@@ -1,7 +1,8 @@
//
// JSONKit.m
// http://github.com/johnezang/JSONKit
-// Licensed under the terms of the BSD License, as specified below.
+// Dual licensed under either the terms of the BSD License, or alternatively
+// under the terms of the Apache License, Version 2.0, as specified below.
//
/*
@@ -36,6 +37,22 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ Copyright 2011 John Engelhart
+
+ 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.
+*/
+
/*
Acknowledgments:

0 comments on commit 3c6ff50

Please sign in to comment.