diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-24 09:24:57 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-24 09:24:57 -0700 |
| commit | cf4db6d9a7ae63dd0afa452e9c5b4d9cdc328c0a (patch) | |
| tree | 308fc4640eb2b3c017ca004091e8e5654dc0345e /src/core/client_config/resolvers/dns_resolver.c | |
| parent | cd29c58c3778bef10dd2d9d4313684d534f4d492 (diff) | |
| parent | 1b81cc40cdedd8faed13ba3f9150cfb6159f05b3 (diff) | |
Merge branch 'that-which-we-call-a-rose' into tis-but-thy-name
Diffstat (limited to 'src/core/client_config/resolvers/dns_resolver.c')
0 files changed, 0 insertions, 0 deletions