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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/LICENSE

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 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/DEPS ('k') | third_party/protobuf/Makefile.am » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/LICENSE
diff --git a/third_party/protobuf/COPYING.txt b/third_party/protobuf/LICENSE
similarity index 78%
rename from third_party/protobuf/COPYING.txt
rename to third_party/protobuf/LICENSE
index 705db579c94f7fe3e95528e9fb0d7de71d606369..f028c82324202241b99522ed311d1c369c1eee66 100644
--- a/third_party/protobuf/COPYING.txt
+++ b/third_party/protobuf/LICENSE
@@ -1,5 +1,14 @@
-Copyright 2008, Google Inc.
-All rights reserved.
+This license applies to all parts of Protocol Buffers except the following:
+
+ - Atomicops support for generic gcc, located in
+ src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.
+ This file is copyrighted by Red Hat Inc.
+
+ - Atomicops support for AIX/POWER, located in
+ src/google/protobuf/stubs/atomicops_internals_power.h.
+ This file is copyrighted by Bloomberg Finance LP.
+
+Copyright 2014, Google Inc. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
« no previous file with comments | « third_party/protobuf/DEPS ('k') | third_party/protobuf/Makefile.am » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698