mirror of
				https://github.com/msgpack/msgpack-c.git
				synced 2025-11-02 14:03:43 +01:00 
			
		
		
		
	Conflicts: include/msgpack/adaptor/char_ptr.hpp include/msgpack/adaptor/cpp11/array.hpp include/msgpack/adaptor/cpp11/array_char.hpp include/msgpack/adaptor/cpp11/tuple.hpp include/msgpack/adaptor/cpp11/unordered_map.hpp include/msgpack/adaptor/cpp11/unordered_set.hpp include/msgpack/adaptor/deque.hpp include/msgpack/adaptor/list.hpp include/msgpack/adaptor/map.hpp include/msgpack/adaptor/set.hpp include/msgpack/adaptor/string.hpp include/msgpack/adaptor/tr1/unordered_map.hpp include/msgpack/adaptor/tr1/unordered_set.hpp include/msgpack/adaptor/vector.hpp include/msgpack/adaptor/vector_char.hpp include/msgpack/object.hpp include/msgpack/unpack.hpp