diff options
author | Craig Tiller <ctiller@google.com> | 2015-02-04 16:32:56 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-02-04 16:32:56 -0800 |
commit | 4b6ab78f365a837de3ba88ccfc73124fce267484 (patch) | |
tree | 57e2fe72321f3c9f285c40abfc122156b7e4542e /vsprojects/vs2013 | |
parent | fd9d0b47e504fc79bb58d809696c1b964070af7d (diff) | |
parent | 56c3dd7d6c604221e9b5f26fcc90ff593068004f (diff) |
Merge github.com:google/grpc into async-api
Diffstat (limited to 'vsprojects/vs2013')
-rw-r--r-- | vsprojects/vs2013/gpr.vcxproj | 4 | ||||
-rw-r--r-- | vsprojects/vs2013/gpr.vcxproj.filters | 12 |
2 files changed, 0 insertions, 16 deletions
diff --git a/vsprojects/vs2013/gpr.vcxproj b/vsprojects/vs2013/gpr.vcxproj index f71b586aff..0d429ab43d 100644 --- a/vsprojects/vs2013/gpr.vcxproj +++ b/vsprojects/vs2013/gpr.vcxproj @@ -91,11 +91,7 @@ <ClInclude Include="..\..\include\grpc\support\sync_posix.h" /> <ClInclude Include="..\..\include\grpc\support\sync_win32.h" /> <ClInclude Include="..\..\include\grpc\support\thd.h" /> - <ClInclude Include="..\..\include\grpc\support\thd_posix.h" /> - <ClInclude Include="..\..\include\grpc\support\thd_win32.h" /> <ClInclude Include="..\..\include\grpc\support\time.h" /> - <ClInclude Include="..\..\include\grpc\support\time_posix.h" /> - <ClInclude Include="..\..\include\grpc\support\time_win32.h" /> <ClInclude Include="..\..\include\grpc\support\useful.h" /> </ItemGroup> <ItemGroup> diff --git a/vsprojects/vs2013/gpr.vcxproj.filters b/vsprojects/vs2013/gpr.vcxproj.filters index 013ed4b3c9..a992558654 100644 --- a/vsprojects/vs2013/gpr.vcxproj.filters +++ b/vsprojects/vs2013/gpr.vcxproj.filters @@ -135,21 +135,9 @@ <ClInclude Include="..\..\include\grpc\support\thd.h"> <Filter>include\grpc\support</Filter> </ClInclude> - <ClInclude Include="..\..\include\grpc\support\thd_posix.h"> - <Filter>include\grpc\support</Filter> - </ClInclude> - <ClInclude Include="..\..\include\grpc\support\thd_win32.h"> - <Filter>include\grpc\support</Filter> - </ClInclude> <ClInclude Include="..\..\include\grpc\support\time.h"> <Filter>include\grpc\support</Filter> </ClInclude> - <ClInclude Include="..\..\include\grpc\support\time_posix.h"> - <Filter>include\grpc\support</Filter> - </ClInclude> - <ClInclude Include="..\..\include\grpc\support\time_win32.h"> - <Filter>include\grpc\support</Filter> - </ClInclude> <ClInclude Include="..\..\include\grpc\support\useful.h"> <Filter>include\grpc\support</Filter> </ClInclude> |