diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-07-15 20:33:59 -0700 |
| commit | 11002e70c607255cf91fea0f998fe945ca6ddc5e (patch) | |
| tree | eadc17fc1043b12cccdd5868e775bc540faa9841 /src/Makefile.am | |
| parent | 385baaa87c52abf5339b0be7dccf8a4131667117 (diff) | |
| parent | fde6e89f99eda04a4f1b8677bcea07e6c2040405 (diff) | |
| download | protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.gz protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.tar.bz2 protobuf-11002e70c607255cf91fea0f998fe945ca6ddc5e.zip | |
Merge remote-tracking branch 'upstream/master' into csharp-experimental
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cea3089e..233b6260 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,6 @@ nobase_include_HEADERS = \ google/protobuf/stubs/fastmem.h \ google/protobuf/stubs/hash.h \ google/protobuf/stubs/once.h \ - google/protobuf/stubs/pbconfig.h \ google/protobuf/stubs/platform_macros.h \ google/protobuf/stubs/shared_ptr.h \ google/protobuf/stubs/singleton.h \ |