Merge branch 'master' of git://github.com/msgpack/msgpack

Conflicts:
	java/pom.xml
This commit is contained in:
takeshita 2011-04-27 01:07:17 +09:00
commit 5e7563ac5b
38 changed files with 6176 additions and 185 deletions

View file

@ -2,8 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.msgpack</groupId>
<artifactId>msgpack</artifactId>
<version>0.5.2-SNAPSHOT</version>
<artifactId>msgpack</artifactId>
<version>0.5.2-SNAPSHOT</version>
<description>MessagePack for Java</description>
<name>MessagePack for Java</name>