diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-12-19 14:50:32 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-12-19 14:50:32 -0800 |
| commit | 96810dea740df75e7a3ff65f11dab7f7383cef7f (patch) | |
| tree | 75647c1ec4ae38c12ea48e1a2d1e867d979f86cb /src/google/protobuf/stubs/common.h | |
| parent | 7bd16064847c410c0f1e5169b8f494fee8b14c93 (diff) | |
| parent | eff55ece0813c16d318a80ec20c89d81bac34efc (diff) | |
| download | protobuf-96810dea740df75e7a3ff65f11dab7f7383cef7f.tar.gz protobuf-96810dea740df75e7a3ff65f11dab7f7383cef7f.tar.bz2 protobuf-96810dea740df75e7a3ff65f11dab7f7383cef7f.zip | |
Merge branch '3.5.x' of github.com:google/protobuf into changelog
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 "" |