diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-08 18:44:37 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-08 18:44:37 -0700 |
| commit | d9d1da95c6a4b95339b23ab22ddbe0611b5fccad (patch) | |
| tree | 8ed2615c59d191fdd85c6116cdf1ca90215455ed /src | |
| parent | 3b8dadf5814157a656d60dccadd7cb820a429050 (diff) | |
| download | protobuf-d9d1da95c6a4b95339b23ab22ddbe0611b5fccad.tar.gz protobuf-d9d1da95c6a4b95339b23ab22ddbe0611b5fccad.tar.bz2 protobuf-d9d1da95c6a4b95339b23ab22ddbe0611b5fccad.zip | |
Update version number to 2.6.1rc1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/google/protobuf/stubs/common.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b32635da..45ba4d3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -95,7 +95,7 @@ nobase_include_HEADERS = \ lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_lite_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined +libprotobuf_lite_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined libprotobuf_lite_la_SOURCES = \ google/protobuf/stubs/atomicops_internals_x86_gcc.cc \ google/protobuf/stubs/atomicops_internals_x86_msvc.cc \ @@ -117,7 +117,7 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/io/zero_copy_stream_impl_lite.cc libprotobuf_la_LIBADD = $(PTHREAD_LIBS) -libprotobuf_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined +libprotobuf_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined libprotobuf_la_SOURCES = \ $(libprotobuf_lite_la_SOURCES) \ google/protobuf/stubs/strutil.cc \ @@ -146,7 +146,7 @@ libprotobuf_la_SOURCES = \ google/protobuf/compiler/parser.cc libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la -libprotoc_la_LDFLAGS = -version-info 9:0:0 -export-dynamic -no-undefined +libprotoc_la_LDFLAGS = -version-info 9:1:0 -export-dynamic -no-undefined libprotoc_la_SOURCES = \ google/protobuf/compiler/code_generator.cc \ google/protobuf/compiler/command_line_interface.cc \ diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index 79ced81f..f096fa99 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -113,7 +113,7 @@ namespace internal { // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 2006000 +#define GOOGLE_PROTOBUF_VERSION 2006001 // The minimum library version which works with the current version of the // headers. |