diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 06:25:39 +0100 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 06:25:39 +0100 |
commit | bf192eff5632213772ea3351f552722741d68e99 (patch) | |
tree | 2caecb5a960425ff69a4b68068c66d9d05260c04 /vsprojects/vcxproj | |
parent | 9d476392b7082f0aba187867c0ed873c96f5949f (diff) | |
parent | d5d83aa33f0bab183ea64dea877abf6cdb0ec65a (diff) |
Merge branch 'alarming' into make-ruby-installable
Conflicts:
tools/run_tests/sources_and_headers.json
Diffstat (limited to 'vsprojects/vcxproj')
4 files changed, 10 insertions, 0 deletions
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj index 9cff22110b..8f6ed3b838 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj @@ -664,6 +664,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\byte_buffer.c"> diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters index 521ce2e1da..22b154aad5 100644 --- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters +++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters @@ -298,6 +298,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> <Filter>src\core\json</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> <Filter>src\core\surface</Filter> </ClCompile> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj index a5707687eb..4c68db9ae3 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj @@ -682,6 +682,8 @@ </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\byte_buffer.c"> diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters index 2720c4e196..5f66f587c4 100644 --- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters +++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters @@ -361,6 +361,9 @@ <ClCompile Include="$(SolutionDir)\..\src\core\json\json_writer.c"> <Filter>src\core\json</Filter> </ClCompile> + <ClCompile Include="$(SolutionDir)\..\src\core\surface\alarm.c"> + <Filter>src\core\surface</Filter> + </ClCompile> <ClCompile Include="$(SolutionDir)\..\src\core\surface\api_trace.c"> <Filter>src\core\surface</Filter> </ClCompile> |