diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-20 14:17:29 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-20 14:17:29 -0800 |
| commit | 8a87fb8ecf2aa838ffa5b10b9ef2422174e2aa06 (patch) | |
| tree | f203ac7451267e003bd9a849cf468e99876f1ffd /LICENSE | |
| parent | 6a51460b985bc715b32d43b8e8f284e36b051f36 (diff) | |
| parent | 9ae3b0b07c24d164db5a5040842d46aded9cd561 (diff) | |
Merge pull request #79 from xfxyjwf/license
Update LICENSE to list files that aren't copyrighted by Google Inc.
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 |