aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Jon Skeet <skeet@pobox.com>2015-06-19 17:35:01 +0100
committerGravatar Jon Skeet <skeet@pobox.com>2015-06-19 17:35:01 +0100
commit50a3a809e849fad5a53be5ccbaefaa02a106b535 (patch)
tree8c4441b6abee41b5e960e7013e5aeb6761616a22 /.gitignore
parent8e9dd12b3a2a30dacf3b782d4062c43ec68ff2f6 (diff)
parent5b3a8e76356ef2dcb4a87c3fa7323bdec01cf7ce (diff)
Merge remote-tracking branch 'upstream/master' into proto3-only
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ea7e654f..e1772469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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