diff options
| author |  yang-g <yangg@google.com> | 2016-01-14 09:50:48 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-01-14 09:50:48 -0800 |
| commit | b9a1377fab3a25fd60e8b632dcf688d470ee9127 (patch) | |
| tree | 892ebff764d5e1158fff90e0b9323d2e4f06b219 /src/cpp | |
| parent | d42262e22ebeda07705400e1ce8a77dbdca668a7 (diff) | |
| parent | dafa125c7b01df1003b96ea2619eb39956f5ddcc (diff) | |
Merge remote-tracking branch 'upstream/master' into sync_async_mix
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/util/byte_buffer.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/util/byte_buffer.cc b/src/cpp/util/byte_buffer.cc index faed33139d..df873eb1ce 100644 --- a/src/cpp/util/byte_buffer.cc +++ b/src/cpp/util/byte_buffer.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -88,4 +88,4 @@ ByteBuffer& ByteBuffer::operator=(const ByteBuffer& buf) { return *this; } -} // namespace grpc +} // namespace grpc
\ No newline at end of file |