diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-06-25 13:22:10 -0700 |
| commit | 82d3d7d250645322f8a7343188e5ae6246a76414 (patch) | |
| tree | 34b7acb87b15c3b8395df3d311f2e795a1285d60 /configure.ac | |
| parent | 35567c166842cca3ff6af3226ff526f25c79507f (diff) | |
| parent | f7ada1280fac4af717d478e6a9765d3f02b418b3 (diff) | |
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 634c0a69..69b3fe30 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,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],[3.5.2],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.6.0],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) |