third_party/protobuf/README.chromium - Issue 693943003: Update from https://crrev.com/302630

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 693943003: Update from https://crrev.com/302630 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month 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 b6ccf575c69534371db652c8f4d95ce2a3df43db..92391f6be3025def28bbda7e05139cfe5c30794b 100644

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

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

@@ -33,3 +33,5 @@ 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

+References to `vector` were changed to `std::vector` in extension_set.h

+and unknown_field_set.h