Merge tag 'refs/tags/sync-piper' into sync-stage

Browse Source

# Conflicts:
#	src/google/protobuf/compiler/java/java_message.cc
#	src/google/protobuf/compiler/java/java_message_lite.cc

pull/9522/head

David L. Jones 3 years ago

parent 972b122a30 1ba1d73e0d

commit a6c9a5f69d

70 changed files with 2176 additions and 1803 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save