Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: third_party/protobuf/COPYING.txt

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/protobuf/CONTRIBUTORS.txt ('k') | third_party/protobuf/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/COPYING.txt
diff --git a/third_party/tcmalloc/vendor/packages/deb/copyright b/third_party/protobuf/COPYING.txt
similarity index 83%
copy from third_party/tcmalloc/vendor/packages/deb/copyright
copy to third_party/protobuf/COPYING.txt
index 1a11eb73ca41edc3f4bb3986a7c62b8d16e62f31..705db579c94f7fe3e95528e9fb0d7de71d606369 100644
--- a/third_party/tcmalloc/vendor/packages/deb/copyright
+++ b/third_party/protobuf/COPYING.txt
@@ -1,11 +1,4 @@
-This package was debianized by Craig Silverstein <google-perftools@googlegroups.com>
-on Fri, 03 Feb 2012 15:40:45 -0800.
-
-It was downloaded from http://code.google.com/p/gperftools/downloads/list
-
-Upstream Author: google-perftools@googlegroups.com
-
-Copyright (c) 2005, Google Inc.
+Copyright 2008, Google Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -33,3 +26,8 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it. This code is not
+standalone and requires a support library to be linked with it. This
+support library is itself covered by the above license.
« no previous file with comments | « third_party/protobuf/CONTRIBUTORS.txt ('k') | third_party/protobuf/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698