diff options
| author | Tamas Berghammer <tberghammer@google.com> | 2016-06-03 17:53:47 -0700 |
|---|---|---|
| committer | Tamas Berghammer <tberghammer@google.com> | 2016-06-06 16:38:21 -0700 |
| commit | b0575e93e4c39dec69365b850088a1eb7f82c5b3 (patch) | |
| tree | af0dd50df9603fdc849ad26d3d6b50384035d51e /CONTRIBUTORS.txt | |
| parent | 9f183e211f11e0e5c0a1fa519107dbfbb1a8d4ca (diff) | |
| download | protobuf-b0575e93e4c39dec69365b850088a1eb7f82c5b3.tar.gz | |
Update from protobuf v2.6.1 to protobuf 3.0.0-beta-3
This change just copies the upstream code into the repository without
fixing the Android.mk or fixing the possible cmpile errors. All of those
will be fixed with foloowup CLs.
Bug: b/28974522
Change-Id: I79fb3966dbef85915965692fa6ab14dc611ed9ea
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 717ffc145..b8d97fc23 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -17,6 +17,12 @@ Proto2 Python primary authors: Will Robinson <robinson@google.com> Petar Petrov <petar@google.com> +Java Nano primary authors: + Brian Duff <bduff@google.com> + Tom Chao <chaot@google.com> + Max Cai <maxtroy@google.com> + Ulas Kirazci <ulas@google.com> + Large code contributions: Jason Hsueh <jasonh@google.com> Joseph Schorr <jschorr@google.com> @@ -91,3 +97,6 @@ Patch contributors: William Orr <will@worrbase.com> * Fixed detection of sched_yield on Solaris. * Added atomicops for Solaris + Andrew Paprocki <andrew@ishiboo.com> + * Fixed minor IBM xlC compiler build issues + * Added atomicops for AIX (POWER) |