diff options
| author |  jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 20:17:53 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 20:17:53 +0000 |
| commit | 1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3 (patch) | |
| tree | b2a894794db1f6147214e356c20f754e270f4e7f /java/pom.xml | |
| parent | 786379af4766fa7ec22b51862ba6e84156b1f9cb (diff) | |
merge tags/2.6.0 into trunk
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/pom.xml b/java/pom.xml index dc3f63f2..a92da320 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -10,7 +10,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.5.1-pre</version> + <version>2.6.0</version> <packaging>bundle</packaging> <name>Protocol Buffer Java API</name> <description> |