AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
This commit is contained in:
Jisi Liu 2015-07-17 11:36:29 -07:00
commit 4dde2a87a9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -72,6 +72,7 @@ nobase_include_HEADERS = \
google/protobuf/stubs/atomicops_internals_x86_gcc.h \ google/protobuf/stubs/atomicops_internals_x86_gcc.h \
google/protobuf/stubs/atomicops_internals_x86_msvc.h \ google/protobuf/stubs/atomicops_internals_x86_msvc.h \
google/protobuf/stubs/callback.h \ google/protobuf/stubs/callback.h \
google/protobuf/stubs/bytestream.h \
google/protobuf/stubs/casts.h \ google/protobuf/stubs/casts.h \
google/protobuf/stubs/common.h \ google/protobuf/stubs/common.h \
google/protobuf/stubs/fastmem.h \ google/protobuf/stubs/fastmem.h \
@ -85,7 +86,9 @@ nobase_include_HEADERS = \
google/protobuf/stubs/scoped_ptr.h \ google/protobuf/stubs/scoped_ptr.h \
google/protobuf/stubs/shared_ptr.h \ google/protobuf/stubs/shared_ptr.h \
google/protobuf/stubs/singleton.h \ google/protobuf/stubs/singleton.h \
google/protobuf/stubs/status.h \
google/protobuf/stubs/stl_util.h \ google/protobuf/stubs/stl_util.h \
google/protobuf/stubs/stringpiece.h \
google/protobuf/stubs/template_util.h \ google/protobuf/stubs/template_util.h \
google/protobuf/stubs/type_traits.h \ google/protobuf/stubs/type_traits.h \
google/protobuf/any.pb.h \ google/protobuf/any.pb.h \