diff options
| author |  Yang Gao <yangg@google.com> | 2015-04-15 11:38:24 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-04-15 11:38:24 -0700 |
| commit | 0f5621d13137085703085a81e241f47f95d95d1d (patch) | |
| tree | 5fbbaf6467db7c1d40895f22253fac947ca77b3e /vsprojects/vs2013/grpc_test_util.vcxproj | |
| parent | 084ef5267213b6b87e913ec5e9af738fde016c8f (diff) | |
| parent | db38bb1d824833a509facbe76a0a8b4d25add99b (diff) | |
sync and resolve conflict
Diffstat (limited to 'vsprojects/vs2013/grpc_test_util.vcxproj')
| -rw-r--r-- | vsprojects/vs2013/grpc_test_util.vcxproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vsprojects/vs2013/grpc_test_util.vcxproj b/vsprojects/vs2013/grpc_test_util.vcxproj index 4756f53928..d25fd7cbf1 100644 --- a/vsprojects/vs2013/grpc_test_util.vcxproj +++ b/vsprojects/vs2013/grpc_test_util.vcxproj @@ -98,6 +98,8 @@ </ClCompile> <ClCompile Include="..\..\test\core\util\port_posix.c"> </ClCompile> + <ClCompile Include="..\..\test\core\util\port_windows.c"> + </ClCompile> <ClCompile Include="..\..\test\core\util\slice_splitter.c"> </ClCompile> </ItemGroup> |