e47cdd5a55
Conflicts: python/google/protobuf/descriptor_pool.py python/google/protobuf/internal/api_implementation_default_test.py python/google/protobuf/internal/cpp_message.py python/google/protobuf/internal/descriptor_database_test.py python/google/protobuf/internal/descriptor_pool_test.py python/google/protobuf/internal/descriptor_python_test.py python/google/protobuf/internal/descriptor_test.py python/google/protobuf/internal/generator_test.py python/google/protobuf/internal/message_factory_python_test.py python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/message_test.py python/google/protobuf/internal/proto_builder_test.py python/google/protobuf/internal/python_message.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/service_reflection_test.py python/google/protobuf/internal/symbol_database_test.py python/google/protobuf/internal/text_encoding_test.py python/google/protobuf/internal/text_format_test.py python/google/protobuf/internal/unknown_fields_test.py python/google/protobuf/internal/wire_format_test.py python/google/protobuf/pyext/descriptor_cpp2_test.py python/google/protobuf/pyext/message_factory_cpp2_test.py python/google/protobuf/pyext/reflection_cpp2_generated_test.py python/setup.py ruby/lib/google/protobuf/message_exts.rb
108 lines
1.9 KiB
Plaintext
108 lines
1.9 KiB
Plaintext
# autogen.sh-generated files
|
|
Makefile.in
|
|
src/Makefile.in
|
|
config.guess
|
|
config.h.in
|
|
config.sub
|
|
configure
|
|
depcomp
|
|
install-sh
|
|
ltmain.sh
|
|
missing
|
|
|
|
aclocal.m4
|
|
m4/libtool.m4
|
|
m4/ltoptions.m4
|
|
m4/ltsugar.m4
|
|
m4/ltversion.m4
|
|
m4/lt~obsolete.m4
|
|
autom4te.cache
|
|
|
|
# downloaded files
|
|
gmock
|
|
|
|
# in-tree configure-generated files
|
|
Makefile
|
|
src/Makefile
|
|
/config.h
|
|
config.log
|
|
config.status
|
|
|
|
libtool
|
|
protobuf-lite.pc
|
|
protobuf.pc
|
|
.deps
|
|
stamp-h1
|
|
|
|
# in-tree build products
|
|
*.o
|
|
*.lo
|
|
*.la
|
|
src/.libs
|
|
*.so
|
|
|
|
.dirstamp
|
|
|
|
any_test.pb.*
|
|
map*unittest.pb.*
|
|
unittest*.pb.*
|
|
cpp_test*.pb.*
|
|
src/google/protobuf/util/**/*.pb.cc
|
|
src/google/protobuf/util/**/*.pb.h
|
|
|
|
*.pyc
|
|
*.so
|
|
*.egg-info
|
|
*_pb2.py
|
|
python/*.egg
|
|
python/.eggs/
|
|
python/.tox
|
|
python/build/
|
|
python/google/protobuf/compiler/
|
|
|
|
src/protoc
|
|
src/unittest_proto_middleman
|
|
|
|
# Generated test scaffolding
|
|
src/protobuf*-test
|
|
src/test_plugin
|
|
src/testzip.*
|
|
src/zcg*zip
|
|
ar-lib
|
|
|
|
test-driver
|
|
compile
|
|
|
|
src/**/*.log
|
|
src/**/*.trs
|
|
|
|
# JavaBuild output.
|
|
java/target
|
|
javanano/target
|
|
|
|
# Windows native output.
|
|
cmake/build
|
|
|
|
# NuGet packages: we want the repository configuration, but not the
|
|
# packages themselves.
|
|
/csharp/src/packages/*/
|
|
|
|
# Directories created by opening the Objective C Xcode projects.
|
|
objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcuserdata/
|
|
objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_OSX.xccheckout
|
|
objectivec/ProtocolBuffers_OSX.xcodeproj/xcuserdata/
|
|
objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcuserdata/
|
|
objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/ProtocolBuffers_iOS.xccheckout
|
|
objectivec/ProtocolBuffers_iOS.xcodeproj/xcuserdata/
|
|
# OS X's Finder creates these for state about opened windows/etc.
|
|
**/.DS_Store
|
|
|
|
# Comformance test output
|
|
conformance/.libs/
|
|
conformance/com/
|
|
conformance/conformance-cpp
|
|
conformance/conformance-test-runner
|
|
conformance/conformance.pb.cc
|
|
conformance/conformance.pb.h
|
|
conformance/protoc_middleman
|