Skip to content

Commit

Permalink
Merge pull request protocolbuffers#1559 from google/beta-3
Browse files Browse the repository at this point in the history
Merge beta-3 release branch again.
  • Loading branch information
liujisi committed May 18, 2016
2 parents 32e3d7a + 97aa8a0 commit cbb9183
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion protoc-artifacts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>3.0.0-beta-2</version>
<version>3.0.0-beta-3</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
Expand Down
1 change: 1 addition & 0 deletions python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ def get_option_from_sys_argv(option_str):
name='protobuf',
version=GetVersion(),
description='Protocol Buffers',
download_url='https://github.com/google/protobuf/releases',
long_description="Protocol Buffers are Google's data interchange format",
url='https://developers.google.com/protocol-buffers/',
maintainer='protobuf@googlegroups.com',
Expand Down

0 comments on commit cbb9183

Please sign in to comment.