diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-13 22:41:37 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-08-13 22:41:37 +0000 |
| commit | 8169c7fcde43861e4f55f5491f2b0c9ec367147b (patch) | |
| tree | 7ec07d9832e7e6adf611312e23e0e80da5e1323b | |
| parent | 201b9be95d86f79ec8beb46a556975292af880e0 (diff) | |
| download | protobuf-8169c7fcde43861e4f55f5491f2b0c9ec367147b.tar.gz protobuf-8169c7fcde43861e4f55f5491f2b0c9ec367147b.tar.bz2 protobuf-8169c7fcde43861e4f55f5491f2b0c9ec367147b.zip | |
Set version number to 2.2.1 in trunk.
| -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/descriptor.pb.h | 2 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 5049d9e9..754a190f 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.2.0-pre],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.2.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 91874e79..849ef5da 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.2.0-pre</version> + <version>2.2.1-pre</version> <packaging>jar</packaging> <name>Protocol Buffer Java API</name> <description> diff --git a/python/setup.py b/python/setup.py index c293e686..118ccd41 100755 --- a/python/setup.py +++ b/python/setup.py @@ -105,7 +105,7 @@ if __name__ == '__main__': generate_proto("../src/google/protobuf/descriptor.proto") setup(name = 'protobuf', - version = '2.2.0-pre', + version = '2.2.1-pre', packages = [ 'google' ], namespace_packages = [ 'google' ], test_suite = 'setup.MakeTestSuite', diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index bc4ec31d..4bf7369f 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -12,7 +12,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 2002000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2002001 < 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 964fb6a6..c789a776 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 2002000 +#define GOOGLE_PROTOBUF_VERSION 2002001 // The minimum library version which works with the current version of the // headers. |