diff options
| -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 08e4ea80..7b5f0dd6 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.4.1-pre],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.4.2-pre],[protobuf@googlegroups.com],[protobuf]) AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) diff --git a/java/pom.xml b/java/pom.xml index d1b44c0f..e28d6db5 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.4.1-pre</version> + <version>2.4.2-pre</version> <packaging>jar</packaging> <name>Protocol Buffer Java API</name> <description> diff --git a/python/setup.py b/python/setup.py index 2c460cc6..7d9714ec 100755 --- a/python/setup.py +++ b/python/setup.py @@ -118,7 +118,7 @@ if __name__ == '__main__': libraries = [ "protobuf" ])) setup(name = 'protobuf', - version = '2.4.1-pre', + version = '2.4.2-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 14216c2a..1cf8a556 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 2004001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2004002 < 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 95febb81..267d0d35 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 2004001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 2004002 < 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 7173a84d..7f5fd4d2 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -108,7 +108,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 2004001 +#define GOOGLE_PROTOBUF_VERSION 2004002 // The minimum library version which works with the current version of the // headers. |