Skip to content

P
protobuf
Commit 4dde2a87 authored by Jisi Liu's avatar Jisi Liu
Browse files
Options

Merge branch 'master' of github.com:google/protobuf into splitheader 

Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
parents 7b216119 2f4fb642
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
src/Makefile.am
View file @ 4dde2a87
......@@ -72,6 +72,7 @@ nobase_include_HEADERS = \
google/protobuf/stubs/atomicops_internals_x86_gcc.h \
google/protobuf/stubs/atomicops_internals_x86_msvc.h \
google/protobuf/stubs/callback.h \
google/protobuf/stubs/bytestream.h \
google/protobuf/stubs/casts.h \
google/protobuf/stubs/common.h \
google/protobuf/stubs/fastmem.h \
......@@ -85,7 +86,9 @@ nobase_include_HEADERS = \
google/protobuf/stubs/scoped_ptr.h \
google/protobuf/stubs/shared_ptr.h \
google/protobuf/stubs/singleton.h \
google/protobuf/stubs/status.h \
google/protobuf/stubs/stl_util.h \
google/protobuf/stubs/stringpiece.h \
google/protobuf/stubs/template_util.h \
google/protobuf/stubs/type_traits.h \
google/protobuf/any.pb.h \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment