diff options
| author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 20:17:53 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 20:17:53 +0000 |
| commit | 1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3 (patch) | |
| tree | b2a894794db1f6147214e356c20f754e270f4e7f /configure.ac | |
| parent | 786379af4766fa7ec22b51862ba6e84156b1f9cb (diff) | |
| download | protobuf-1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3.tar.gz protobuf-1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3.tar.bz2 protobuf-1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3.zip | |
merge tags/2.6.0 into trunk
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 f8fb3b69..bc496c93 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,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],[2.5.1-pre],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.6.0],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) |