diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 15:13:58 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 15:13:58 -0800 |
commit | 9ae3b0b07c24d164db5a5040842d46aded9cd561 (patch) | |
tree | 5859eb9831028897401c43409c2ef35521b43464 /LICENSE | |
parent | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (diff) | |
download | protobuf-9ae3b0b07c24d164db5a5040842d46aded9cd561.tar.gz protobuf-9ae3b0b07c24d164db5a5040842d46aded9cd561.tar.bz2 protobuf-9ae3b0b07c24d164db5a5040842d46aded9cd561.zip |
Update LICENSE to list files that aren't copyrighted by Google Inc.
This is following what V8 does:
https://code.google.com/p/v8/source/browse/trunk/LICENSE
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -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 |