From 5304c1b047782c367e014d8ec7dc9563b43c1157 Mon Sep 17 00:00:00 2001 From: "eugenis@chromium.org" Date: Fri, 22 Mar 2013 09:30:00 +0000 Subject: third-party/protobuf: Cherry-pick r475 and r476 from upstream. These changes are required to build with libcxx. R=rsimha@chromium.org,brettw@chromium.org TBR=cpu@chromium.org BUG=178409 Review URL: https://codereview.chromium.org/12854003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189778 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/protobuf/README.chromium | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'third_party/protobuf/README.chromium') diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium index 20c2810..6e82e82 100644 --- a/third_party/protobuf/README.chromium +++ b/third_party/protobuf/README.chromium @@ -26,10 +26,9 @@ This code has been patched to make the target protobuf_lite a component so that targets that depend on it can be componentized. See http://crbug.com/172800 for details, and r179806 for the patch. - -Revisions r427 and r430 were cherry-picked from upstream. - -Cherry-pick patch from http://code.google.com/p/protobuf/issues/detail?id=425. +Revisions r427, r430, r475 and r476 were cherry-picked from upstream. +Patch from http://code.google.com/p/protobuf/issues/detail?id=425 was +cherry-picked from upstream. Notes about Java: We have not forked the Java version of protobuf-lite, so the Java version does -- cgit v1.1