aboutsummaryrefslogtreecommitdiffhomepage
path: root/LICENSE
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2014-11-11 15:13:58 -0800
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2014-11-11 15:13:58 -0800
commit9ae3b0b07c24d164db5a5040842d46aded9cd561 (patch)
tree5859eb9831028897401c43409c2ef35521b43464 /LICENSE
parentfaf581d20866ad5e586b3e515f6c547d2dcec2c1 (diff)
Update LICENSE to list files that aren't copyrighted by Google Inc.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE13
1 files changed, 11 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 705db579..a15d52c1 100644
--- a/LICENSE
+++ b/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_aix.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