diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
| commit | 383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (patch) | |
| tree | 45bdce007f64e47ff2a0b60fb1920efc3eaf3b00 /src/google/protobuf/stubs/common.h | |
| parent | 8529f2aee33ae793c9ce362a45370b98f675370a (diff) | |
| parent | 88e5573b9a8a5c4038f9db3633610f032aab277d (diff) | |
Merge remote-tracking branch 'origin/3.5.x' into master
Diffstat (limited to 'src/google/protobuf/stubs/common.h')
| -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 79bb2396..d11b8100 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 3005000 +#define GOOGLE_PROTOBUF_VERSION 3005001 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "" |