diff options
| author |  Bo Yang <teboring@google.com> | 2017-07-17 09:36:22 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2017-07-18 11:06:16 -0700 |
| commit | 6ec0b7e4d1fb606c6572a946e4eae97273367e67 (patch) | |
| tree | d983812539a3299ff130fff469140bdcd1bb1690 /src/google/protobuf/stubs | |
| parent | 324b20a49170cb38d15ef243bc044026adb54ae1 (diff) | |
| parent | 5532abc15b97f3489183b266b41844306052a3fa (diff) | |
Merge 3.3.x into master
Diffstat (limited to 'src/google/protobuf/stubs')
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 19d59843..a56f8e89 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -101,7 +101,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 3003000 +#define GOOGLE_PROTOBUF_VERSION 3003002 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "" |