diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-03-28 14:10:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-28 14:10:13 -0700 |
commit | 7bf47a6b5d10382a4b427677cf7ca9288f4e2833 (patch) | |
tree | 6a0f3fb6f724e93366cb236733ec7ce10b70df36 | |
parent | c8ed69587238c346f76f864bc731aa3b5fe3cf61 (diff) | |
parent | 9e080f7ac007b75dacbd233b214e5c0cb2e48e0f (diff) | |
download | protobuf-7bf47a6b5d10382a4b427677cf7ca9288f4e2833.tar.gz protobuf-7bf47a6b5d10382a4b427677cf7ca9288f4e2833.tar.bz2 protobuf-7bf47a6b5d10382a4b427677cf7ca9288f4e2833.zip |
Merge pull request #4433 from xfxyjwf/license
Cleanup LICENSE file.
-rw-r--r-- | LICENSE | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -1,14 +1,4 @@ -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. +Copyright 2008 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 |