Skip to content

Commit 3c6ff50

Browse files
committed
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
1 parent 1b123b6 commit 3c6ff50

File tree

2 files changed

+37
-2
lines changed

2 files changed

+37
-2
lines changed

JSONKit.h

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
//
22
// JSONKit.h
33
// http://github.com/johnezang/JSONKit
4-
// Licensed under the terms of the BSD License, as specified below.
4+
// http://github.com/johnezang/JSONKit
5+
// Dual licensed under either the terms of the BSD License, or alternatively
6+
// under the terms of the Apache License, Version 2.0, as specified below.
57
//
68

79
/*
@@ -36,6 +38,22 @@
3638
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3739
*/
3840

41+
/*
42+
Copyright 2011 John Engelhart
43+
44+
Licensed under the Apache License, Version 2.0 (the "License");
45+
you may not use this file except in compliance with the License.
46+
You may obtain a copy of the License at
47+
48+
http://www.apache.org/licenses/LICENSE-2.0
49+
50+
Unless required by applicable law or agreed to in writing, software
51+
distributed under the License is distributed on an "AS IS" BASIS,
52+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
53+
See the License for the specific language governing permissions and
54+
limitations under the License.
55+
*/
56+
3957
#include <stddef.h>
4058
#include <stdint.h>
4159
#include <limits.h>

JSONKit.m

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//
22
// JSONKit.m
33
// http://github.com/johnezang/JSONKit
4-
// Licensed under the terms of the BSD License, as specified below.
4+
// Dual licensed under either the terms of the BSD License, or alternatively
5+
// under the terms of the Apache License, Version 2.0, as specified below.
56
//
67

78
/*
@@ -36,6 +37,22 @@
3637
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3738
*/
3839

40+
/*
41+
Copyright 2011 John Engelhart
42+
43+
Licensed under the Apache License, Version 2.0 (the "License");
44+
you may not use this file except in compliance with the License.
45+
You may obtain a copy of the License at
46+
47+
http://www.apache.org/licenses/LICENSE-2.0
48+
49+
Unless required by applicable law or agreed to in writing, software
50+
distributed under the License is distributed on an "AS IS" BASIS,
51+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
52+
See the License for the specific language governing permissions and
53+
limitations under the License.
54+
*/
55+
3956

4057
/*
4158
Acknowledgments:

0 commit comments

Comments
 (0)