From 1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3 Mon Sep 17 00:00:00 2001 From: "jieluo@google.com" Date: Mon, 25 Aug 2014 20:17:53 +0000 Subject: merge tags/2.6.0 into trunk --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') 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]) -- cgit v1.2.3