diff options
author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-01-09 01:02:25 +0000 |
---|---|---|
committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2010-01-09 01:02:25 +0000 |
commit | ea75323710c34e73e02288211a0edbcf9c6a765f (patch) | |
tree | a524631b3bd30d5fe7fac3ccc30a936a4b2bcd09 | |
parent | 38b744eaa75b1112ee3c52aa765a137dd3589fa2 (diff) | |
download | protobuf-ea75323710c34e73e02288211a0edbcf9c6a765f.tar.gz protobuf-ea75323710c34e73e02288211a0edbcf9c6a765f.tar.bz2 protobuf-ea75323710c34e73e02288211a0edbcf9c6a765f.zip |
Update version number in trunk to 2.3.1.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | java/pom.xml | 2 | ||||
-rwxr-xr-x | python/setup.py | 2 | ||||
-rw-r--r-- | src/google/protobuf/compiler/plugin.pb.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/descriptor.pb.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index e7ceb002..d6035ef3 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[2.3.0-pre],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.3.1-pre],[protobuf@googlegroups.com],[protobuf]) AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) diff --git a/java/pom.xml b/java/pom.xml index dd28a46d..94f1d7f6 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.3.0-pre</version> + <version>2.3.1-pre</version> <packaging>jar</packaging> <name>Protocol Buffer Java API</name> <description> diff --git a/python/setup.py b/python/setup.py index a5472616..8c97439f 100755 --- a/python/setup.py +++ b/python/setup.py @@ -98,7 +98,7 @@ if __name__ == '__main__': generate_proto("../src/google/protobuf/descriptor.proto") setup(name = 'protobuf', - version = '2.3.0-pre', + version = '2.3.1-pre', packages = [ 'google' ], namespace_packages = [ 'google' ], test_suite = 'setup.MakeTestSuite', diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index f8f80535..bd6bf63c 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 2003000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2003001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index 2743b6f5..205c5476 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 2003000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2003001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 551ee4aa..b8d2ecb9 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -83,7 +83,7 @@ namespace internal { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 2003000 +#define GOOGLE_PROTOBUF_VERSION 2003001 // The minimum library version which works with the current version of the // headers. |