summaryrefslogtreecommitdiffstats
path: root/third_party/protobuf/src
Commit message (Collapse)AuthorAgeFilesLines
* third_party/protobuf: update to upstream r371agl@chromium.org2011-04-0297-2333/+8951
| | | | | | | | | | | | | | | | | | | | (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
* Revert "third_party/protobuf: update to upstream r371"agl@chromium.org2011-04-0197-8951/+2333
| | | | | | This reverts commit r80180 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80183 0039d316-1c4b-4281-b951-d872f2087c98
* third_party/protobuf: update to upstream r371agl@chromium.org2011-04-0197-2333/+8951
| | | | | | | | | | | | | | | | | | 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@80180 0039d316-1c4b-4281-b951-d872f2087c98
* Move some files from base to base/memory.levin@chromium.org2011-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raw_scoped_refptr_mismatch_checker.h ref_counted.cc ref_counted.h ref_counted_memory.cc ref_counted_memory.h ref_counted_unittest.cc scoped_callback_factory.h scoped_comptr_win.h scoped_handle.h scoped_native_library.cc scoped_native_library.h scoped_native_library_unittest.cc scoped_nsobject.h scoped_open_process.h scoped_ptr.h scoped_ptr_unittest.cc scoped_temp_dir.cc scoped_temp_dir.h scoped_temp_dir_unittest.cc scoped_vector.h singleton.h singleton_objc.h singleton_unittest.cc linked_ptr.h linked_ptr_unittest.cc weak_ptr.cc weak_ptr.h weak_ptr_unittest.cc BUG=None TEST=Compile Review URL: http://codereview.chromium.org/6714032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79524 0039d316-1c4b-4281-b951-d872f2087c98
* protobuf: add unknown field retention to protobuf-lite.agl@chromium.org2010-10-1218-622/+587
| | | | | | | | | BUG=56579 TEST=sync_unit_tests Review URL: http://codereview.chromium.org/3544012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62331 0039d316-1c4b-4281-b951-d872f2087c98
* protobuf: check in local copy.agl@chromium.org2010-09-30194-0/+91380
This change doesn't make us *use* the local copy yet, that's the next step. The checked in code is taken from the same SVN revision which we currently pull with DEPS. (This is a no-op change from the point of view of the build.) BUG=56579 TEST=none http://codereview.chromium.org/3549005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61072 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-01-29 21:29:16 +0000