Skip to content

Commit 953077b

Browse files
redboltzredboltz
committed
Merge pull request #386 from redboltz/update_license
Version 1.3.0.
2 parents b76c8ae + ba15089 commit 953077b

File tree

120 files changed

+367
-1784
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+367
-1784
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2015-11-21 version 1.3.0
2+
* Change the license from the Apache License Version 2.0 to the
3+
Boost Software License, Version 1.0.(#386)
4+
* Remove some warnings (#365)
5+
* Add std::reference_wrapper support(#373, #384)
6+
* Improve tests (#375, #378, #379, #380)
7+
* Fix msvc specific problem (#376, #383)
8+
* Fix typos (#381)
19
2015-09-04 version 1.2.0
210
<< breaking change >>
311
* Change std::vector<unsigned char> and std::array<unsigned char>

‎COPYING‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
Copyright (C) 2008-2010 FURUHASHI Sadayuki
2-
3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
6-
7-
http://www.apache.org/licenses/LICENSE-2.0
8-
9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License.
1+
Copyright (C) 2008-2015 FURUHASHI Sadayuki
142

3+
Distributed under the Boost Software License, Version 1.0.
4+
(See accompanying file LICENSE_1_0.txt or copy at
5+
http://www.boost.org/LICENSE_1_0.txt)

‎CROSSLANG.md‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎LICENSE‎

Lines changed: 0 additions & 202 deletions
This file was deleted.

‎LICENSE_1_0.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Boost Software License - Version 1.0 - August 17th, 2003
2+
3+
Permission is hereby granted, free of charge, to any person or organization
4+
obtaining a copy of the software and accompanying documentation covered by
5+
this license (the "Software") to use, reproduce, display, distribute,
6+
execute, and transmit the Software, and to prepare derivative works of the
7+
Software, and to permit third-parties to whom the Software is furnished to
8+
do so, all subject to the following:
9+
10+
The copyright notices in the Software and this entire statement, including
11+
the above license grant, this restriction and the following disclaimer,
12+
must be included in all copies of the Software, in whole or in part, and
13+
all derivative works of the Software, unless such copies or derivative
14+
works are solely in the form of machine-executable object code generated by
15+
a source language processor.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
20+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
21+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
22+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

‎Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SUBDIRS = src test
22

33
DOC_FILES = \
44
README.md \
5-
LICENSE \
5+
LICENSE_1_0.txt \
66
NOTICE \
77
msgpack_vc8.vcproj \
88
msgpack_vc8.sln

‎NOTICE‎

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
This product bundles Boost Predef, which is available under a
2-
Boost Software License - Version 1.0. For details, see the following files
1+
This product bundles Boost Predef and Boost Preprocessor.
2+
They are distributed under the Boost Software License, Version 1.0.
3+
(See accompanying file LICENSE_1_0.txt or copy at
4+
http://www.boost.org/LICENSE_1_0.txt)
5+
6+
For details, see the following files:
37

48
external/boost/predef
59
include/msgpack/predef.h
@@ -8,29 +12,3 @@ include/msgpack/predef/*
812
external/boost/preprocessor
913
include/msgpack/preprocessor.hpp
1014
include/msgpack/preprocessor/*
11-
12-
---------------------------------------------------------------------------
13-
Boost Software License - Version 1.0 - August 17th, 2003
14-
15-
Permission is hereby granted, free of charge, to any person or organization
16-
obtaining a copy of the software and accompanying documentation covered by
17-
this license (the "Software") to use, reproduce, display, distribute,
18-
execute, and transmit the Software, and to prepare derivative works of the
19-
Software, and to permit third-parties to whom the Software is furnished to
20-
do so, all subject to the following:
21-
22-
The copyright notices in the Software and this entire statement, including
23-
the above license grant, this restriction and the following disclaimer,
24-
must be included in all copies of the Software, in whole or in part, and
25-
all derivative works of the Software, unless such copies or derivative
26-
works are solely in the form of machine-executable object code generated by
27-
a source language processor.
28-
29-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31-
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
32-
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
33-
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
34-
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
35-
DEALINGS IN THE SOFTWARE.
36-
---------------------------------------------------------------------------

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
`msgpack` for C/C++
22
===================
33

4-
Version 1.2.0 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
4+
Version 1.3.0 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
55

66
It's like JSON but small and fast.
77

@@ -215,5 +215,5 @@ Here's the list of [great contributors](https://github.com/msgpack/msgpack-c/gra
215215
License
216216
-------
217217

218-
`msgpack-c` is licensed under the Apache License Version 2.0. See
219-
the [`LICENSE`](./LICENSE) file for details.
218+
`msgpack-c` is licensed under the Boost Software License, Version 1.0. See
219+
the [`LICENSE_1_0.txt`](./LICENSE_1_0.txt) file for details.

‎cases.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)