Takatoshi Kondo 5c0f1db25c Merge branch 'poc/0.6' of https://github.com/redboltz/msgpack-c into redboltz-poc/0.6 ...

Conflicts:
	.travis.yml
	CMakeLists.txt
	README.md
	ci/build_autotools.sh
	ci/build_cmake.sh
	src/msgpack/object.hpp
	src/msgpack/type/fixint.hpp
	src/msgpack/type/int.hpp
	src/msgpack/type/tr1/unordered_map.hpp
	src/msgpack/type/tr1/unordered_set.hpp
	test/msgpack_test.cpp
	test/object.cc

2014-10-26 15:40:22 +09:00

..

build_autotools.sh

Added a 32bit environment tests for travis-ci.

2014-10-26 09:06:01 +09:00

build_cmake.sh

Merge branch 'poc/0.6' of https://github.com/redboltz/msgpack-c into redboltz-poc/0.6

2014-10-26 15:40:22 +09:00