diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-24 00:12:30 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-24 00:38:19 +0200 |
| commit | 23be2803662c19f73a66c82c9d5dbd62b537515f (patch) | |
| tree | 9d8afeb18c21cddcbfb9bb014f08f1474021db98 /vsprojects/grpc_csharp_ext/packages.config | |
| parent | b7c2035e83a9b3e346f1fd37f9ad55c2070fb02e (diff) | |
| parent | 3afd92ff511f52db3ecf892d9af65053323c89cb (diff) | |
Merge branch 'master' of github.com:grpc/grpc into the-purge-2
Conflicts:
src/cpp/client/channel.cc
vsprojects/vs2010/grpc++.vcxproj
vsprojects/vs2013/grpc++.vcxproj.filters
Diffstat (limited to 'vsprojects/grpc_csharp_ext/packages.config')
| -rw-r--r-- | vsprojects/grpc_csharp_ext/packages.config | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vsprojects/grpc_csharp_ext/packages.config b/vsprojects/grpc_csharp_ext/packages.config new file mode 100644 index 0000000000..07f483bc8c --- /dev/null +++ b/vsprojects/grpc_csharp_ext/packages.config @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<packages> + <package id="grpc.dependencies.openssl" version="1.0.2.2" targetFramework="Native" /> + <package id="grpc.dependencies.openssl.redist" version="1.0.2.2" targetFramework="Native" /> + <package id="grpc.dependencies.zlib" version="1.2.8.9" targetFramework="Native" /> + <package id="grpc.dependencies.zlib.redist" version="1.2.8.9" targetFramework="Native" /> +</packages> |