diff options
| author | Jon Skeet <skeet@pobox.com> | 2015-06-19 17:35:01 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2015-06-19 17:35:01 +0100 |
| commit | 50a3a809e849fad5a53be5ccbaefaa02a106b535 (patch) | |
| tree | 8c4441b6abee41b5e960e7013e5aeb6761616a22 /.gitignore | |
| parent | 8e9dd12b3a2a30dacf3b782d4062c43ec68ff2f6 (diff) | |
| parent | 5b3a8e76356ef2dcb4a87c3fa7323bdec01cf7ce (diff) | |
| download | protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.tar.gz protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.tar.bz2 protobuf-50a3a809e849fad5a53be5ccbaefaa02a106b535.zip | |
Merge remote-tracking branch 'upstream/master' into proto3-only
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -19,7 +19,7 @@ m4/lt~obsolete.m4 autom4te.cache # downloaded files -gtest +gmock # in-tree configure-generated files Makefile @@ -47,6 +47,8 @@ any_test.pb.* map*unittest.pb.* unittest*.pb.* cpp_test*.pb.* +src/google/protobuf/util/**/*.pb.cc +src/google/protobuf/util/**/*.pb.h *.pyc *.egg-info |