third_party/protobuf/README.chromium - Issue 517273003: Cherry pick r573 from upstream protobuf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/README.chromium

Issue 517273003: Cherry pick r573 from upstream protobuf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/protobuf/README.chromium

diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium

index de7839265a1a20c3fbbbd4142123bf3994f0e768..a52aef8fe950a4cfde40418c2a17b2f6dacdc02c 100644

--- a/third_party/protobuf/README.chromium

+++ b/third_party/protobuf/README.chromium

@@ -33,6 +33,7 @@ Revision 517 was cherry-picked from upstream.

Revision 522 was cherry-picked from upstream.

Revision 523 was cherry-picked from upstream.

Revision 524 was cherry-picked from upstream.

+Revision 573 was cherry-picked from upstream.

The `&file->options() != NULL &&` was removed from descriptor.cc

Notes about Java:

« no previous file with comments | « no previous file | third_party/protobuf/src/google/protobuf/stubs/atomicops.h » ('j') | no next file with comments »