diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-08-25 09:57:23 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-25 09:57:23 -0700 |
| commit | 179e62467931c75a78a7528541760fa3e086e312 (patch) | |
| tree | d8f4ba0e89daf04164f69b4a82abcc65e79d609e /src/cpp/client | |
| parent | d7ff4ff40071d2b486a052183e3e9f9382afb745 (diff) | |
| parent | 102fa966b67c2aca6dbfb9ff4833505615adab0a (diff) | |
Merge pull request #7828 from ctiller/rename-some-things-for-fun-and-profit
Rename some files to avoid conflicting .obj files on Windows
Diffstat (limited to 'src/cpp/client')
| -rw-r--r-- | src/cpp/client/channel_cc.cc (renamed from src/cpp/client/channel.cc) | 0 | ||||
| -rw-r--r-- | src/cpp/client/credentials_cc.cc (renamed from src/cpp/client/credentials.cc) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel_cc.cc index 43b3875cb3..43b3875cb3 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel_cc.cc diff --git a/src/cpp/client/credentials.cc b/src/cpp/client/credentials_cc.cc index e6a4f81b0d..e6a4f81b0d 100644 --- a/src/cpp/client/credentials.cc +++ b/src/cpp/client/credentials_cc.cc |