diff options
| author |  David G. Quintas <dgq@google.com> | 2016-03-31 22:17:45 -0700 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2016-03-31 22:17:45 -0700 |
| commit | 95d6767bf3dcd6516bb995b822725f8ff4e85ab6 (patch) | |
| tree | 7ea75eb2ece80f93fcaf1b25f2bb0178e6ed9732 /src/cpp/util | |
| parent | 1e681c2474d560254d3d26116ec3574a060dcfcd (diff) | |
| parent | 7661da5b417130262ded988b2f881ab619d3b244 (diff) | |
Merge branch 'master' into sockaddr_resolver_lb_2
Diffstat (limited to 'src/cpp/util')
| -rw-r--r-- | src/cpp/util/byte_buffer.cc | 2 | ||||
| -rw-r--r-- | src/cpp/util/string_ref.cc | 2 | ||||
| -rw-r--r-- | src/cpp/util/time.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cpp/util/byte_buffer.cc b/src/cpp/util/byte_buffer.cc index 3a2318d1a6..c0a14de418 100644 --- a/src/cpp/util/byte_buffer.cc +++ b/src/cpp/util/byte_buffer.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/cpp/util/string_ref.cc b/src/cpp/util/string_ref.cc index b55019b5f2..a16601de5d 100644 --- a/src/cpp/util/string_ref.cc +++ b/src/cpp/util/string_ref.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/cpp/util/time.cc b/src/cpp/util/time.cc index bb5fce389d..c43d848cc6 100644 --- a/src/cpp/util/time.cc +++ b/src/cpp/util/time.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |