diff options
author | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
commit | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (patch) | |
tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /configure.ac | |
parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
parent | 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff) | |
download | protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.gz protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.bz2 protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.zip |
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 69b3fe30..8e1c308c 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.6.0],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.6.1],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) |