diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-04-21 13:57:55 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-21 13:57:55 -0700 |
| commit | 062db022b767177b76fe2cdc221244594f29e473 (patch) | |
| tree | 818770624f004c57189681facdb114e44e0ed4a3 /templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template | |
| parent | d2b11fafdc533ae7547ca69a9dbd536c35da98c1 (diff) | |
| parent | 3cdb3b627e4d43806567c6591b5691cd1b6d36d2 (diff) | |
Merge github.com:google/grpc into batch-metadata
Conflicts:
Makefile
vsprojects/Grpc.mak
vsprojects/vs2010/Grpc.mak
vsprojects/vs2010/grpc.vcxproj
vsprojects/vs2010/grpc.vcxproj.filters
vsprojects/vs2010/grpc_test_util.vcxproj
vsprojects/vs2010/grpc_unsecure.vcxproj
vsprojects/vs2010/grpc_unsecure.vcxproj.filters
Diffstat (limited to 'templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template')
| -rw-r--r-- | templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template b/templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template deleted file mode 100644 index 84aa50209a..0000000000 --- a/templates/vsprojects/vs2013/grpc_csharp_ext.vcxproj.template +++ /dev/null @@ -1,2 +0,0 @@ -<%namespace file="vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc_csharp_ext', libs, targets)} |