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/csharp/ext | |
parent | 1e681c2474d560254d3d26116ec3574a060dcfcd (diff) | |
parent | 7661da5b417130262ded988b2f881ab619d3b244 (diff) |
Merge branch 'master' into sockaddr_resolver_lb_2
Diffstat (limited to 'src/csharp/ext')
-rw-r--r-- | src/csharp/ext/grpc_csharp_ext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/ext/grpc_csharp_ext.c b/src/csharp/ext/grpc_csharp_ext.c index 642dc9ef42..8d769e5f6a 100644 --- a/src/csharp/ext/grpc_csharp_ext.c +++ b/src/csharp/ext/grpc_csharp_ext.c @@ -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 |