From 9ae3b0b07c24d164db5a5040842d46aded9cd561 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Tue, 11 Nov 2014 15:13:58 -0800 Subject: 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 --- LICENSE | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'LICENSE') 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 -- cgit v1.2.3