aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-08-13 22:41:37 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-08-13 22:41:37 +0000
commit8169c7fcde43861e4f55f5491f2b0c9ec367147b (patch)
tree7ec07d9832e7e6adf611312e23e0e80da5e1323b /src
parent201b9be95d86f79ec8beb46a556975292af880e0 (diff)
downloadprotobuf-8169c7fcde43861e4f55f5491f2b0c9ec367147b.tar.gz
protobuf-8169c7fcde43861e4f55f5491f2b0c9ec367147b.tar.bz2
protobuf-8169c7fcde43861e4f55f5491f2b0c9ec367147b.zip
Set version number to 2.2.1 in trunk.
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/descriptor.pb.h2
-rw-r--r--src/google/protobuf/stubs/common.h2
2 files changed, 2 insertions, 2 deletions
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.