diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-02-04 23:41:51 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-02-04 23:41:51 +0100 |
| commit | 900dadb2df70c41f5008db854f9ff1cec5920f03 (patch) | |
| tree | 101ea8d827dc4d012bfcbb0042c953199ef9c8a0 /vsprojects/vs2013/gpr.vcxproj | |
| parent | ee0c96c7fc4bdcf908969eedb96b248e33db1cbb (diff) | |
| parent | 034152f5befdc06dbd9b4bf613b8ab152c2625df (diff) | |
Merge branch 'master' of github.com:google/grpc into grpc-win32
Conflicts:
include/grpc/support/time_win32.h
Diffstat (limited to 'vsprojects/vs2013/gpr.vcxproj')
| -rw-r--r-- | vsprojects/vs2013/gpr.vcxproj | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vsprojects/vs2013/gpr.vcxproj b/vsprojects/vs2013/gpr.vcxproj index 0a11b617c5..64354e0b49 100644 --- a/vsprojects/vs2013/gpr.vcxproj +++ b/vsprojects/vs2013/gpr.vcxproj @@ -92,11 +92,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> |