organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #1964 from thomasvl/missing_ignores

Browse source 
Fix up ignores and conformance generation
This commit is contained in:
Thomas Van Lenten 2016-08-15 16:38:44 -04:00 • committed by GitHub
commit d9ccf4d0b1
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -64,6 +64,8 @@ src/protoc
src/unittest_proto_middleman
# Generated test scaffolding
src/no_warning_test.cc
src/no-warning-test
src/protobuf*-test
src/test_plugin
src/testzip.*
@ -108,7 +110,7 @@ conformance/conformance.pb.cc
conformance/conformance.pb.h
conformance/Conformance.pbobjc.h
conformance/Conformance.pbobjc.m
conformance/conformance.rb
conformance/conformance_pb.rb
conformance/google/
conformance/javac_middleman
conformance/lite/

2
conformance/Makefile.am
View file

@ -20,7 +20,7 @@ other_language_protoc_outputs = \
conformance_pb2.py \
Conformance.pbobjc.h \
Conformance.pbobjc.m \
conformance.rb \
conformance_pb.rb \
com/google/protobuf/Any.java \
com/google/protobuf/AnyOrBuilder.java \
com/google/protobuf/AnyProto.java \