Skip to content

Commit

Permalink
Modified the JSONKit so that it is dual licensed under either the BSD…
Browse files Browse the repository at this point in the history
… or Apache v2.0 license. This was motivated by the discussion at facebookarchive/three20#465
  • Loading branch information
johnezang committed Mar 28, 2011
1 parent 1b123b6 commit 3c6ff50
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 2 deletions.
20 changes: 19 additions & 1 deletion JSONKit.h
Original file line number Diff line number Diff line change
@@ -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.
//

/*
Expand Down Expand Up @@ -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>
Expand Down
19 changes: 18 additions & 1 deletion JSONKit.m
Original file line number Diff line number Diff line change
@@ -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.
//

/*
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 3c6ff50

Please sign in to comment.