Skip to content

Commit

Permalink
Merge pull request #42 from BlackEdder/license
Browse files Browse the repository at this point in the history
FIX #40: Relicense to Boost license
  • Loading branch information
BlackEdder committed Aug 11, 2015
2 parents c458699 + 81757a9 commit c68946b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 17 deletions.
31 changes: 20 additions & 11 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
Copyright (c) 2014-2015 Edwin van Leeuwen
2015 Pierre Krafft
Boost Software License - Version 1.0 - August 17th, 2003

All rights reserved.
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

12 changes: 6 additions & 6 deletions dub.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "painlessjson",
"description": "Converting custom types to and from JSON the painless way.",
"homepage": "https://github.com/BlackEdder/painlessjson",
"copyright": "Copyright © 2014, Edwin van Leeuwen",
"authors": ["Edwin van Leeuwen","Pierre Krafft"],
"license": "BSD 3-clause",
"name": "painlessjson",
"description": "Converting custom types to and from JSON the painless way.",
"homepage": "https://github.com/BlackEdder/painlessjson",
"copyright": "Copyright © 2014-2015, Edwin van Leeuwen",
"authors": ["Edwin van Leeuwen","Pierre Krafft"],
"license": "BSL-1.0",
"dependencies": {
"dunit": "~>1.0.10"
},
Expand Down

0 comments on commit c68946b

Please sign in to comment.