Merge pull request #468 from redboltz/ver1.4.2

Updated version number.
msgpack · May 27, 2016 · e59f6e6 · e59f6e6
2 parents 8388ced + 9a8405b
commit e59f6e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2016-05-26 version 1.4.2
+  * Fix C++03 msgpack::zone::clear() memory access violation bug (#467)
+
 # 2016-03-06 version 1.4.1
 
   * Fix TARGET_OS_IPHONE checking (#436, #438)

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================
 
-Version 1.4.1 [![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)
+Version 1.4.2 [![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)
 
 It's like JSON but small and fast.
 

diff --git a/include/msgpack/version_master.h b/include/msgpack/version_master.h
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    1
 #define MSGPACK_VERSION_MINOR    4
-#define MSGPACK_VERSION_REVISION 1
+#define MSGPACK_VERSION_REVISION 2