Merge pull request #439 from redboltz/ver1.4.1

Updated the version to 1.4.1.
msgpack · Mar 6, 2016 · 7df9671 · 7df9671
2 parents ae8de13 + 437400c
commit 7df9671
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2016-03-06 version 1.4.1
+
+  * Fix TARGET_OS_IPHONE checking (#436, #438)
+  * Fix invalid front() call for empty container (#435. #437)
+  * Fix compile error on g++6 (C++11 only) (#426, #428)
+  * Fix zone size expansion logic (#423, #427)
+
 # 2016-01-22 version 1.4.0
 
 ## << recommended changes >>

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================
 
-Version 1.4.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)
+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)
 
 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 0
+#define MSGPACK_VERSION_REVISION 1