generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-18 03:29:49 +02:00
Code Issues Projects Releases Wiki Activity

Solved conflicts on README.md.

Browse Source
This commit is contained in:
Takatoshi Kondo
2014-10-27 11:09:49 +09:00
parent 8455a2eb70
commit a9cf916b82
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@@ -20,11 +20,7 @@ The source for msgpack-c is held at [msgpack-c](https://github.com/msgpack/msgpa
To report an issue, use the [msgpack-c issue tracker](https://github.com/msgpack/msgpack-c/issues) at github.com. To report an issue, use the [msgpack-c issue tracker](https://github.com/msgpack/msgpack-c/issues) at github.com.
## Version ## Version
<<<<<<< HEAD
0.5.9 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) 0.5.9 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c)
=======
0.6.0 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=poc/0.6)](https://travis-ci.org/msgpack/msgpack-c)
>>>>>>> 466986b5190ae8e03065e7b614702ec2f43dce1c
## Using Msgpack ## Using Msgpack
@@ -110,15 +106,6 @@ e.g.) tortoise git https://code.google.com/p/tortoisegit/
1. Build all. 1. Build all.
<<<<<<< HEAD
or using GUI git client.
=======
#### Install from package
>>>>>>> 466986b5190ae8e03065e7b614702ec2f43dce1c
Install from package for this branch (poc/0.6) is not supported yet.
### Code Example ### Code Example
#include <msgpack.hpp> #include <msgpack.hpp>