diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-21 16:36:59 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-21 16:36:59 -0700 |
commit | f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d (patch) | |
tree | baaba8a2cbfbe263870769401b3ca52dd5e36da2 /configure.ac | |
parent | 2853cd4a10febda5ba7407e2e8570eae411761a6 (diff) | |
parent | bba83652e1be610bdb7ee1566ad18346d98b843c (diff) | |
download | protobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.tar.gz protobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.tar.bz2 protobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.zip |
Merge changes from 2.6.1 release branch.
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 ba408af3..c07067cf 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.6.1rc1],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[2.6.1],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) |