Skip to content

Commit 7bee573

Browse files
committed
Merge branch 'release-1.0.1'
2 parents 6748648 + 5568abb commit 7bee573

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2015-3-22 version 1.0.1:
2+
* Fix compilation error on Mac 10.9 (#244)
3+
* Fix typos in documents (#240)
4+
* Update CHANGELOG.md for version 1.0.0 (#242)
5+
* Fix erb templates for the next code generation (#239)
6+
17
2015-03-10 version 1.0.0:
28
* Support msgpack v5 format (str, bin, and ext) https://github.com/msgpack/msgpack/blob/master/spec.md (#142)
39
* Support std::tuple, std::forward_list, std::array, std::unordered_set, std::unordered_map on C++11. tr1 unordered containers are still supported (#53, #130, #137, #154, #169)

README.md

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

4-
Version 1.0.0 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c)
4+
Version 1.0.1 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c)
55

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

include/msgpack/version_master.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#define MSGPACK_VERSION_MAJOR 1
22
#define MSGPACK_VERSION_MINOR 0
3-
#define MSGPACK_VERSION_REVISION 0
3+
#define MSGPACK_VERSION_REVISION 1

0 commit comments

Comments
 (0)