diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 09:13:27 -0700 |
| commit | 5b9e7430d9e056b393ea6aec199260d763840ba5 (patch) | |
| tree | eec1d00f3f8c41435d7732d6694f8eca4d7b30ec /templates/vsprojects/grpc++/grpc++.vcxproj.template | |
| parent | f7670f3054e4ed05715120728e345e4bb0a13d3d (diff) | |
| parent | ad21fea239769e2a3be14ac56ee747eb0f3c13a3 (diff) | |
Merge github.com:grpc/grpc into bye-bye-completion-queue-pie
Conflicts:
vsprojects/Grpc.mak
Diffstat (limited to 'templates/vsprojects/grpc++/grpc++.vcxproj.template')
| -rw-r--r-- | templates/vsprojects/grpc++/grpc++.vcxproj.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/vsprojects/grpc++/grpc++.vcxproj.template b/templates/vsprojects/grpc++/grpc++.vcxproj.template index fb84a1a801..5f13591b2d 100644 --- a/templates/vsprojects/grpc++/grpc++.vcxproj.template +++ b/templates/vsprojects/grpc++/grpc++.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc++', libs, targets)}
\ No newline at end of file +${gen_project('grpc++', libs)}
\ No newline at end of file |