diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-31 13:11:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-31 13:11:05 -0700 |
| commit | c532c21ee52bdcddf7292560673a61538ea3d29f (patch) | |
| tree | 2ed1a4e7c77546e5c2d42d7fdf8a02c947e2970c /include/grpc++/alarm.h | |
| parent | 3b27de1fc4486d1f62d9c557611ef507143bf120 (diff) | |
| parent | 02f5f8de36924b9fe55ccda800fa465b94bd181d (diff) | |
Merge github.com:grpc/grpc into split-me-baby-one-more-time
Diffstat (limited to 'include/grpc++/alarm.h')
| -rw-r--r-- | include/grpc++/alarm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/grpc++/alarm.h b/include/grpc++/alarm.h index 764837a958..1470fe8d97 100644 --- a/include/grpc++/alarm.h +++ b/include/grpc++/alarm.h @@ -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 |