diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-02-22 23:15:28 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-02-22 23:15:28 -0800 |
| commit | 45add8a445d426959634e172f195c57c56c4ca3d (patch) | |
| tree | eef39567b46b94ae21723961c8ff1980db88dbaf /Makefile | |
| parent | 0160873273be3fb502f05d4349e074422f4addcb (diff) | |
| parent | 27b3f776da80da9d74e9c6a43d6794c86ba0cfb3 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into alarm_cpp
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -2944,7 +2944,6 @@ LIBGRPC++_SRC = \ src/cpp/client/credentials.cc \ src/cpp/client/generic_stub.cc \ src/cpp/client/insecure_credentials.cc \ - src/cpp/common/alarm.cc \ src/cpp/common/call.cc \ src/cpp/common/channel_arguments.cc \ src/cpp/common/completion_queue.cc \ @@ -3225,7 +3224,6 @@ LIBGRPC++_UNSECURE_SRC = \ src/cpp/client/credentials.cc \ src/cpp/client/generic_stub.cc \ src/cpp/client/insecure_credentials.cc \ - src/cpp/common/alarm.cc \ src/cpp/common/call.cc \ src/cpp/common/channel_arguments.cc \ src/cpp/common/completion_queue.cc \ |