diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 12:46:25 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-02 12:46:25 +0000 |
| commit | 5fc07eb1a6c22881419f906f087e798b746809c2 (patch) | |
| tree | 98c0a62100941d9ebbeed499a0d1506edd7f165b /third_party/protobuf/README.chromium | |
| parent | 927f981dd371a9ee26fa9fb1115a1c8b65e976fb (diff) | |
| download | chromium_src-5fc07eb1a6c22881419f906f087e798b746809c2.zip chromium_src-5fc07eb1a6c22881419f906f087e798b746809c2.tar.gz chromium_src-5fc07eb1a6c22881419f906f087e798b746809c2.tar.bz2 | |
third_party/protobuf: update to upstream r371
(This is a reland of r80810.)
1) Got an upstream diff 346:371 from svn
2) Pruned files from the diff that we don't have, as well as
descriptor.pb.*
3) Applied and fixed the merge failures.
4) Copied the code (less descriptor.pb.*) back into the svn source.
5) Manually fixed descriptor.pb.* and plugin.pb.* there.
6) Ran ./generate_descriptor_proto.sh and copied the updated files back.
7) Added new source files to the protoc target in protobuf.gyp.
BUG=none
TEST=sync_unit_tests
Review URL: http://codereview.chromium.org/6737030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf/README.chromium')
| -rw-r--r-- | third_party/protobuf/README.chromium | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/protobuf/README.chromium b/third_party/protobuf/README.chromium index 1318d3a..3bfe9cb 100644 --- a/third_party/protobuf/README.chromium +++ b/third_party/protobuf/README.chromium @@ -3,7 +3,7 @@ Short Name: protobuf URL: http://protobuf.googlecode.com/svn/trunk License File: COPYING.txt Version: unknown -Revision: r346 +Revision: r371 Local files (not taken from upstream): README.chromium |